X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage0%2Fpatches%2Fcommon%2Fncurses-5.9-branch_update-4.patch;fp=stage0%2Fpatches%2Fcommon%2Fncurses-5.9-branch_update-4.patch;h=097f2b19e9b51d110fefe125abf112ca2fec67d8;hb=f17ab848cb756cad27489bf0c2746e5ead466658;hp=0000000000000000000000000000000000000000;hpb=a1358efe562a4e73ef23f25c606a346f684e1c93;p=hvlinux.git diff --git a/stage0/patches/common/ncurses-5.9-branch_update-4.patch b/stage0/patches/common/ncurses-5.9-branch_update-4.patch new file mode 100644 index 0000000..097f2b1 --- /dev/null +++ b/stage0/patches/common/ncurses-5.9-branch_update-4.patch @@ -0,0 +1,75926 @@ +Submitted By: Jonathan Norman (jonathan at bluesquarelinux dot co dot uk) +Date: 2012-08-25 +Initial Package Version: 5.9 +Origin: Upstream +Upstream Status: Applied +Description: Contains all upstream patches up to 5.9-20120616 + +diff -Naur ncurses-5.9.orig/Ada95/aclocal.m4 ncurses-5.9/Ada95/aclocal.m4 +--- ncurses-5.9.orig/Ada95/aclocal.m4 2012-08-25 19:57:59.386567678 +0000 ++++ ncurses-5.9/Ada95/aclocal.m4 2012-08-25 19:58:02.099888180 +0000 +@@ -1,5 +1,5 @@ + dnl*************************************************************************** +-dnl Copyright (c) 2010,2011 Free Software Foundation, Inc. * ++dnl Copyright (c) 2010-2011,2012 Free Software Foundation, Inc. * + dnl * + dnl Permission is hereby granted, free of charge, to any person obtaining a * + dnl copy of this software and associated documentation files (the * +@@ -28,7 +28,7 @@ + dnl + dnl Author: Thomas E. Dickey + dnl +-dnl $Id: aclocal.m4,v 1.24 2011/03/31 23:32:36 tom Exp $ ++dnl $Id: aclocal.m4,v 1.52 2012/08/04 18:12:47 tom Exp $ + dnl Macros used in NCURSES Ada95 auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -39,6 +39,31 @@ + dnl + dnl --------------------------------------------------------------------------- + dnl --------------------------------------------------------------------------- ++dnl CF_ACVERSION_CHECK version: 2 updated: 2011/05/08 11:22:03 ++dnl ------------------ ++dnl Conditionally generate script according to whether we're using a given autoconf. ++dnl ++dnl $1 = version to compare against ++dnl $2 = code to use if AC_ACVERSION is at least as high as $1. ++dnl $3 = code to use if AC_ACVERSION is older than $1. ++define(CF_ACVERSION_CHECK, ++[ ++ifdef([m4_version_compare], ++[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], ++[CF_ACVERSION_COMPARE( ++AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), ++AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_ACVERSION_COMPARE version: 2 updated: 2011/04/14 20:56:50 ++dnl -------------------- ++dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1, ++dnl MAJOR2, MINOR2, TERNARY2, ++dnl PRINTABLE2, not FOUND, FOUND) ++define(CF_ACVERSION_COMPARE, ++[ifelse(builtin([eval], [$2 < $5]), 1, ++[ifelse([$8], , ,[$8])], ++[ifelse([$9], , ,[$9])])])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_ADA_INCLUDE_DIRS version: 6 updated: 2010/02/26 19:52:07 + dnl ------------------- + dnl Construct the list of include-options for the C programs in the Ada95 +@@ -290,12 +315,33 @@ + } + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32 ++dnl CF_ANSI_CC_CHECK version: 11 updated: 2011/07/01 19:47:45 + dnl ---------------- +-dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES' +-dnl in the sharutils 4.2 distribution. ++dnl This was originally adapted from the macros 'fp_PROG_CC_STDC' and ++dnl 'fp_C_PROTOTYPES' in the sharutils 4.2 distribution. + AC_DEFUN([CF_ANSI_CC_CHECK], + [ ++# This should have been defined by AC_PROG_CC ++: ${CC:=cc} ++ ++# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content ++# into CC. This will not help with broken scripts that wrap the compiler with ++# options, but eliminates a more common category of user confusion. ++AC_MSG_CHECKING(\$CC variable) ++case "$CC" in #(vi ++*[[\ \ ]]-[[IUD]]*) ++ AC_MSG_RESULT(broken) ++ AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options) ++ # humor him... ++ cf_flags=`echo "$CC" | sed -e 's/^[[^ ]]*[[ ]]//'` ++ CC=`echo "$CC" | sed -e 's/[[ ]].*//'` ++ CF_ADD_CFLAGS($cf_flags) ++ ;; ++*) ++ AC_MSG_RESULT(ok) ++ ;; ++esac ++ + AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[ + cf_cv_ansi_cc=no + cf_save_CFLAGS="$CFLAGS" +@@ -413,6 +459,35 @@ + AC_SUBST(ARFLAGS) + ]) + dnl --------------------------------------------------------------------------- ++dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31 ++dnl -------------- ++dnl Allow user to disable a normally-on option. ++AC_DEFUN([CF_ARG_DISABLE], ++[CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_ARG_OPTION version: 4 updated: 2010/05/26 05:38:42 ++dnl ------------- ++dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus ++dnl values. ++dnl ++dnl Parameters: ++dnl $1 = option name ++dnl $2 = help-string ++dnl $3 = action to perform if option is not default ++dnl $4 = action if perform if option is default ++dnl $5 = default option value (either 'yes' or 'no') ++AC_DEFUN([CF_ARG_OPTION], ++[AC_ARG_ENABLE([$1],[$2],[test "$enableval" != ifelse([$5],no,yes,no) && enableval=ifelse([$5],no,no,yes) ++ if test "$enableval" != "$5" ; then ++ifelse([$3],,[ :]dnl ++,[ $3]) ifelse([$4],,,[ ++ else ++ $4]) ++ fi],[enableval=$5 ifelse([$4],,,[ ++ $4 ++])dnl ++ ])])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_BUILD_CC version: 6 updated: 2006/10/14 15:23:15 + dnl ----------- + dnl If we're cross-compiling, allow the user to override the tools and their +@@ -504,7 +579,7 @@ + AC_SUBST(BUILD_OBJEXT) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_CFG_DEFAULTS version: 7 updated: 2005/09/24 16:15:00 ++dnl CF_CFG_DEFAULTS version: 8 updated: 2011/06/04 20:09:13 + dnl --------------- + dnl Determine the default configuration into which we'll install ncurses. This + dnl can be overridden by the user's command-line options. There's two items to +@@ -522,7 +597,7 @@ + if test "x$prefix" = "xNONE" ; then + case "$cf_cv_system_name" in + # non-vendor systems don't have a conflict +- openbsd*|freebsd*|linux*|cygwin*|k*bsd*-gnu) ++ openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu) + prefix=/usr + ;; + *) prefix=$ac_default_prefix +@@ -593,7 +668,40 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_CURSES_HEADER version: 2 updated: 2010/04/28 06:02:16 ++dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39 ++dnl ----------------- ++dnl Check if the given compiler is really clang. clang's C driver defines ++dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does ++dnl not ignore some gcc options. ++dnl ++dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to ++dnl ensure that it is not mistaken for gcc/g++. It is normally invoked from ++dnl the wrappers for gcc and g++ warnings. ++dnl ++dnl $1 = GCC (default) or GXX ++dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS ++dnl $3 = CFLAGS (default) or CXXFLAGS ++AC_DEFUN([CF_CLANG_COMPILER],[ ++ifelse([$2],,CLANG_COMPILER,[$2])=no ++ ++if test "$ifelse([$1],,[$1],GCC)" = yes ; then ++ AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler) ++ cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])" ++ ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments" ++ AC_TRY_COMPILE([],[ ++#ifdef __clang__ ++#else ++make an error ++#endif ++],[ifelse([$2],,CLANG_COMPILER,[$2])=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" ++],[]) ++ ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" ++ AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2])) ++fi ++]) ++dnl --------------------------------------------------------------------------- ++dnl CF_CURSES_HEADER version: 3 updated: 2011/05/01 19:47:45 + dnl ---------------- + dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common + dnl variations of ncurses' installs. +@@ -603,10 +711,10 @@ + AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[ + cf_cv_ncurses_header=none + for cf_header in ifelse($1,,,[ \ +- $1/curses.h \ +- $1/ncurses.h]) \ +- curses.h \ +- ncurses.h ifelse($1,,[ncurses/curses.h ncurses/ncurses.h]) ++ $1/ncurses.h \ ++ $1/curses.h]) \ ++ ncurses.h \ ++ curses.h ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) + do + AC_TRY_COMPILE([#include <${cf_header}>], + [initscr(); tgoto("?", 0,0)], +@@ -627,6 +735,67 @@ + dnl "dirname" is not portable, so we fake it with a shell script. + AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57 ++dnl --------------- ++dnl You can always use "make -n" to see the actual options, but it's hard to ++dnl pick out/analyze warning messages when the compile-line is long. ++dnl ++dnl Sets: ++dnl ECHO_LT - symbol to control if libtool is verbose ++dnl ECHO_LD - symbol to prefix "cc -o" lines ++dnl RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o) ++dnl SHOW_CC - symbol to put before explicit "cc -c" lines ++dnl ECHO_CC - symbol to put before any "cc" line ++dnl ++AC_DEFUN([CF_DISABLE_ECHO],[ ++AC_MSG_CHECKING(if you want to see long compiling messages) ++CF_ARG_DISABLE(echo, ++ [ --disable-echo display "compiling" commands], ++ [ ++ ECHO_LT='--silent' ++ ECHO_LD='@echo linking [$]@;' ++ RULE_CC='@echo compiling [$]<' ++ SHOW_CC='@echo compiling [$]@' ++ ECHO_CC='@' ++],[ ++ ECHO_LT='' ++ ECHO_LD='' ++ RULE_CC='' ++ SHOW_CC='' ++ ECHO_CC='' ++]) ++AC_MSG_RESULT($enableval) ++AC_SUBST(ECHO_LT) ++AC_SUBST(ECHO_LD) ++AC_SUBST(RULE_CC) ++AC_SUBST(SHOW_CC) ++AC_SUBST(ECHO_CC) ++])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_ENABLE_PC_FILES version: 9 updated: 2012/08/04 13:59:54 ++dnl ------------------ ++dnl This is the "--enable-pc-files" option, which is available if there is a ++dnl pkg-config configuration on the local machine. ++AC_DEFUN([CF_ENABLE_PC_FILES],[ ++AC_REQUIRE([CF_PKG_CONFIG]) ++AC_REQUIRE([CF_WITH_PKG_CONFIG_LIBDIR]) ++ ++if test "$PKG_CONFIG" != none ; then ++ AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG) ++ AC_ARG_ENABLE(pc-files, ++ [ --enable-pc-files generate and install .pc files for pkg-config], ++ [enable_pc_files=$enableval], ++ [enable_pc_files=no]) ++ AC_MSG_RESULT($enable_pc_files) ++ if test "$enable_pc_files" != no ++ then ++ CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR) ++ fi ++else ++ enable_pc_files=no ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54 + dnl --------------- + dnl Look for a non-standard library, given parameters for AC_TRY_LINK. We +@@ -807,6 +976,25 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_FIXUP_ADAFLAGS version: 1 updated: 2012/03/31 18:48:10 ++dnl ----------------- ++dnl make ADAFLAGS consistent with CFLAGS ++AC_DEFUN([CF_FIXUP_ADAFLAGS],[ ++ AC_MSG_CHECKING(optimization options for ADAFLAGS) ++ case "$CFLAGS" in ++ *-g*) ++ CF_ADD_ADAFLAGS(-g) ++ ;; ++ esac ++ case "$CFLAGS" in ++ *-O*) ++ cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[[ ]].*//'` ++ CF_ADD_ADAFLAGS($cf_O_flag) ++ ;; ++ esac ++ AC_MSG_RESULT($ADAFLAGS) ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32 + dnl ----------------- + dnl Test for availability of useful gcc __attribute__ directives to quiet +@@ -931,7 +1119,7 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32 ++dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39 + dnl --------------- + dnl Check if the compiler supports useful warning options. There's a few that + dnl we don't use, simply because they're too noisy: +@@ -954,6 +1142,7 @@ + [ + AC_REQUIRE([CF_GCC_VERSION]) + CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) ++CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS) + + cat > conftest.$ac_ext <mk_shared_lib.sh <<-CF_EOF ++ #!/bin/sh ++ SHARED_LIB=\[$]1 ++ IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\` ++ shift ++ cat <<-EOF ++ Linking shared library ++ ** SHARED_LIB \[$]SHARED_LIB ++ ** IMPORT_LIB \[$]IMPORT_LIB ++EOF ++ exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB} ++CF_EOF ++ chmod +x mk_shared_lib.sh ++ ;; ++ openbsd[[2-9]].*|mirbsd*) #(vi + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + CF_SHARED_SONAME +@@ -3003,12 +3242,12 @@ + MK_SHARED_LIB='${LD} -Bshareable -o $[@]' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + ;; +- freebsd*) #(vi ++ dragonfly*|freebsd*) #(vi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" +- LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${libdir} $LOCAL_LDFLAGS" +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CF_SHARED_SONAME + MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]' +@@ -3018,7 +3257,7 @@ + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + if test "$cf_cv_shlib_version" = auto; then + if test -f /usr/libexec/ld.elf_so; then + cf_cv_shlib_version=abi +@@ -3123,9 +3362,12 @@ + ;; + esac + +- if test -n "$cf_ld_rpath_opt" ; then +- MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}" +- fi ++ # RPATH_LIST is a colon-separated list of directories ++ test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" ++ test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" ++ ++ CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS) ++ CF_VERBOSE(MK_SHARED_LIB: $MK_SHARED_LIB) + + AC_SUBST(CC_SHARED_OPTS) + AC_SUBST(LD_RPATH_OPT) +@@ -3137,6 +3379,7 @@ + AC_SUBST(LOCAL_LDFLAGS) + AC_SUBST(LOCAL_LDFLAGS2) + AC_SUBST(INSTALL_LIB) ++ AC_SUBST(RPATH_LIST) + ])dnl + dnl --------------------------------------------------------------------------- + dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43 +@@ -3253,6 +3496,45 @@ + AC_SUBST(top_builddir) + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_TRY_XOPEN_SOURCE version: 1 updated: 2011/10/30 17:09:50 ++dnl ------------------- ++dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we ++dnl can define it successfully. ++AC_DEFUN([CF_TRY_XOPEN_SOURCE],[ ++AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ ++ AC_TRY_COMPILE([ ++#include ++#include ++#include ++],[ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif], ++ [cf_cv_xopen_source=no], ++ [cf_save="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ++ AC_TRY_COMPILE([ ++#include ++#include ++#include ++],[ ++#ifdef _XOPEN_SOURCE ++make an error ++#endif], ++ [cf_cv_xopen_source=no], ++ [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) ++ CPPFLAGS="$cf_save" ++ ]) ++]) ++ ++if test "$cf_cv_xopen_source" != no ; then ++ CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) ++ CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) ++ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" ++ CF_ADD_CFLAGS($cf_temp_xopen_source) ++fi ++]) ++dnl --------------------------------------------------------------------------- + dnl CF_UPPER version: 5 updated: 2001/01/29 23:40:59 + dnl -------- + dnl Make an uppercase version of a variable +@@ -3415,6 +3697,32 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_WITH_LIB_PREFIX version: 1 updated: 2012/01/21 19:28:10 ++dnl ------------------ ++dnl Allow the library-prefix to be overridden. OS/2 EMX originally had no ++dnl "lib" prefix, e.g., because it used the dll naming convention. ++dnl ++dnl $1 = variable to set ++AC_DEFUN([CF_WITH_LIB_PREFIX], ++[ ++AC_MSG_CHECKING(if you want to have a library-prefix) ++AC_ARG_WITH(lib-prefix, ++ [ --with-lib-prefix override library-prefix], ++ [with_lib_prefix=$withval], ++ [with_lib_prefix=auto]) ++AC_MSG_RESULT($with_lib_prefix) ++ ++if test $with_lib_prefix = auto ++then ++ CF_LIB_PREFIX($1) ++elif test $with_lib_prefix = no ++then ++ LIB_PREFIX= ++else ++ LIB_PREFIX=$with_lib_prefix ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_WITH_PATH version: 10 updated: 2010/10/23 15:44:18 + dnl ------------ + dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just +@@ -3436,7 +3744,50 @@ + AC_SUBST($3)dnl + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_WITH_PTHREAD version: 3 updated: 2010/05/29 16:31:02 ++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 2 updated: 2011/12/10 18:58:47 ++dnl ------------------------- ++dnl Allow the choice of the pkg-config library directory to be overridden. ++AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[ ++if test "$PKG_CONFIG" != none ; then ++ AC_MSG_CHECKING(for $PKG_CONFIG library directory) ++ AC_ARG_WITH(pkg-config-libdir, ++ [ --with-pkg-config-libdir=XXX use given directory for installing pc-files], ++ [PKG_CONFIG_LIBDIR=$withval], ++ [PKG_CONFIG_LIBDIR=yes]) ++ ++ case x$PKG_CONFIG_LIBDIR in #(vi ++ x/*) #(vi ++ ;; ++ xyes) #(vi ++ # look for the library directory using the same prefix as the executable ++ cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'` ++ case x`(arch) 2>/dev/null` in #(vi ++ *64) #(vi ++ for cf_config in $cf_path/share $cf_path/lib64 $cf_path/lib32 $cf_path/lib ++ do ++ if test -d $cf_config/pkgconfig ++ then ++ PKG_CONFIG_LIBDIR=$cf_config/pkgconfig ++ break ++ fi ++ done ++ ;; ++ *) ++ PKG_CONFIG_LIBDIR=$cf_path/lib/pkgconfig ++ ;; ++ esac ++ ;; ++ *) ++ ;; ++ esac ++ ++ AC_MSG_RESULT($PKG_CONFIG_LIBDIR) ++fi ++ ++AC_SUBST(PKG_CONFIG_LIBDIR) ++])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_WITH_PTHREAD version: 5 updated: 2011/12/10 19:01:56 + dnl --------------- + dnl Check for POSIX thread library. + AC_DEFUN([CF_WITH_PTHREAD], +@@ -3452,28 +3803,33 @@ + AC_CHECK_HEADER(pthread.h,[ + AC_DEFINE(HAVE_PTHREADS_H) + +- AC_MSG_CHECKING(if we can link with the pthread library) +- cf_save_LIBS="$LIBS" +- CF_ADD_LIB(pthread) +- AC_TRY_LINK([ ++ for cf_lib_pthread in pthread c_r ++ do ++ AC_MSG_CHECKING(if we can link with the $cf_lib_pthread library) ++ cf_save_LIBS="$LIBS" ++ CF_ADD_LIB($cf_lib_pthread) ++ AC_TRY_LINK([ + #include + ],[ +- int rc = pthread_create(0,0,0,0); ++ int rc = pthread_create(0,0,0,0); ++ int r2 = pthread_mutexattr_settype(0, 0); + ],[with_pthread=yes],[with_pthread=no]) +- LIBS="$cf_save_LIBS" +- AC_MSG_RESULT($with_pthread) ++ LIBS="$cf_save_LIBS" ++ AC_MSG_RESULT($with_pthread) ++ test "$with_pthread" = yes && break ++ done + +- if test "$with_pthread" = yes ; then +- CF_ADD_LIB(pthread) +- AC_DEFINE(HAVE_LIBPTHREADS) +- else +- AC_MSG_ERROR(Cannot link with pthread library) +- fi ++ if test "$with_pthread" = yes ; then ++ CF_ADD_LIB($cf_lib_pthread) ++ AC_DEFINE(HAVE_LIBPTHREADS) ++ else ++ AC_MSG_ERROR(Cannot link with pthread library) ++ fi + ]) + fi + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37 ++dnl CF_XOPEN_SOURCE version: 42 updated: 2012/01/07 08:26:49 + 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, +@@ -3489,7 +3845,7 @@ + cf_xopen_source= + + case $host_os in #(vi +-aix[[456]]*) #(vi ++aix[[4-7]]*) #(vi + cf_xopen_source="-D_ALL_SOURCE" + ;; + cygwin) #(vi +@@ -3500,6 +3856,7 @@ + ;; + darwin*) #(vi + cf_xopen_source="-D_DARWIN_C_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + freebsd*|dragonfly*) #(vi + # 5.x headers associate +@@ -3517,15 +3874,23 @@ + ;; + irix[[56]].*) #(vi + cf_xopen_source="-D_SGI_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + linux*|gnu*|mint*|k*bsd*-gnu) #(vi + CF_GNU_SOURCE + ;; + mirbsd*) #(vi +- # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks ++ # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks and other headers which use u_int / u_short types ++ cf_XOPEN_SOURCE= ++ CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) + ;; + netbsd*) #(vi +- # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ++ cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ++ ;; ++openbsd[[4-9]]*) #(vi ++ # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw ++ cf_xopen_source="-D_BSD_SOURCE" ++ cf_XOPEN_SOURCE=600 + ;; + openbsd*) #(vi + # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw +@@ -3539,36 +3904,11 @@ + sco*) #(vi + # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer + ;; +-solaris2.1[[0-9]]) #(vi +- cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- ;; +-solaris2.[[1-9]]) #(vi ++solaris2.*) #(vi + cf_xopen_source="-D__EXTENSIONS__" + ;; + *) +- AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ +- AC_TRY_COMPILE([#include ],[ +-#ifndef _XOPEN_SOURCE +-make an error +-#endif], +- [cf_cv_xopen_source=no], +- [cf_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- AC_TRY_COMPILE([#include ],[ +-#ifdef _XOPEN_SOURCE +-make an error +-#endif], +- [cf_cv_xopen_source=no], +- [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) +- CPPFLAGS="$cf_save" +- ]) +-]) +- if test "$cf_cv_xopen_source" != no ; then +- CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) +- CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) +- cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" +- CF_ADD_CFLAGS($cf_temp_xopen_source) +- fi ++ CF_TRY_XOPEN_SOURCE + CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) + ;; + esac +@@ -3576,4 +3916,33 @@ + if test -n "$cf_xopen_source" ; then + CF_ADD_CFLAGS($cf_xopen_source) + fi ++ ++dnl In anything but the default case, we may have system-specific setting ++dnl which is still not guaranteed to provide all of the entrypoints that ++dnl _XOPEN_SOURCE would yield. ++if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then ++ AC_MSG_CHECKING(if _XOPEN_SOURCE really is set) ++ AC_TRY_COMPILE([#include ],[ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif], ++ [cf_XOPEN_SOURCE_set=yes], ++ [cf_XOPEN_SOURCE_set=no]) ++ AC_MSG_RESULT($cf_XOPEN_SOURCE_set) ++ if test $cf_XOPEN_SOURCE_set = yes ++ then ++ AC_TRY_COMPILE([#include ],[ ++#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE ++make an error ++#endif], ++ [cf_XOPEN_SOURCE_set_ok=yes], ++ [cf_XOPEN_SOURCE_set_ok=no]) ++ if test $cf_XOPEN_SOURCE_set_ok = no ++ then ++ AC_MSG_WARN(_XOPEN_SOURCE is lower than requested) ++ fi ++ else ++ CF_TRY_XOPEN_SOURCE ++ fi ++fi + ]) +diff -Naur ncurses-5.9.orig/Ada95/configure ncurses-5.9/Ada95/configure +--- ncurses-5.9.orig/Ada95/configure 2012-08-25 19:57:59.386567678 +0000 ++++ ncurses-5.9/Ada95/configure 2012-08-25 19:58:02.283220646 +0000 +@@ -1,7 +1,7 @@ + #! /bin/sh +-# From configure.in Revision: 1.30 . ++# From configure.in Revision: 1.41 . + # Guess values for system-dependent variables and create Makefiles. +-# Generated by Autoconf 2.52.20101002. ++# Generated by Autoconf 2.52.20120811. + # + # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 + # Free Software Foundation, Inc. +@@ -135,15 +135,16 @@ + bindir='${exec_prefix}/bin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' +-datadir='${prefix}/share' ++datarootdir='${prefix}/share' ++datadir='${datarootdir}' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' + libdir='${exec_prefix}/lib' + includedir='${prefix}/include' + oldincludedir='/usr/include' +-infodir='${prefix}/info' +-mandir='${prefix}/man' ++infodir='${datarootdir}/info' ++mandir='${datarootdir}/man' + + # Identity of this package. + PACKAGE_NAME= +@@ -194,6 +195,13 @@ + | --da=*) + datadir=$ac_optarg ;; + ++ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ ++ | --dataroo | --dataro | --datar) ++ ac_prev=datarootdir ;; ++ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ ++ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) ++ datarootdir=$ac_optarg ;; ++ + -disable-* | --disable-*) + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +@@ -469,7 +477,7 @@ + done + + # Be sure to have absolute paths. +-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ ++for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \ + localstatedir libdir includedir oldincludedir infodir mandir + do + eval ac_val=$`echo $ac_var` +@@ -606,15 +614,16 @@ + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] +- --datadir=DIR read-only architecture-independent data [PREFIX/share] ++ --datarootdir=DIR read-only architecture-independent data [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] +- --infodir=DIR info documentation [PREFIX/info] +- --mandir=DIR man documentation [PREFIX/man] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --mandir=DIR man documentation [DATAROOTDIR/man] + EOF + + cat <<\EOF +@@ -645,6 +654,7 @@ + + --with-system-type=XXX test: override derived host system-type + --with-pkg-config{=path} enable/disable use of pkg-config ++ --with-pkg-config-libdir=XXX use given directory for installing pc-files + --enable-pc-files generate and install .pc files for pkg-config + --without-tests suppress build with test-programs + --enable-mixed-case tic should assume mixed-case filenames +@@ -660,6 +670,7 @@ + --with-shared generate shared C-objects (needed for --with-ada-sharedlib) + --enable-widec compile with wide-char/UTF-8 code + --with-curses-dir=DIR directory in which (n)curses is installed ++ --with-lib-prefix override library-prefix + --with-shlib-version=X Specify rel or abi version for shared libs + --enable-rpath-link link sample programs with rpath option + Fine-Tuning Your Configuration: +@@ -677,7 +688,7 @@ + --enable-reentrant compile with experimental reentrant code + --with-wrap-prefix=XXX override prefix used for public variables + Testing/development Options: +- --enable-echo build: display "compiling" commands (default) ++ --disable-echo display "compiling" commands + --enable-warnings build: turn on GCC compiler warnings + --enable-assertions test: turn on generation of assertion code + --enable-expanded test: generate functions for certain macros +@@ -757,7 +768,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by $as_me, which was +-generated by GNU Autoconf 2.52.20101002. Invocation command line was ++generated by GNU Autoconf 2.52.20120811. Invocation command line was + + $ $0 $@ + +@@ -881,7 +892,7 @@ + fi + for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then +- { echo "$as_me:884: loading site script $ac_site_file" >&5 ++ { echo "$as_me:895: loading site script $ac_site_file" >&5 + echo "$as_me: loading site script $ac_site_file" >&6;} + cat "$ac_site_file" >&5 + . "$ac_site_file" +@@ -892,7 +903,7 @@ + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then +- { echo "$as_me:895: loading cache $cache_file" >&5 ++ { echo "$as_me:906: loading cache $cache_file" >&5 + echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . $cache_file;; +@@ -900,7 +911,7 @@ + esac + fi + else +- { echo "$as_me:903: creating cache $cache_file" >&5 ++ { echo "$as_me:914: creating cache $cache_file" >&5 + echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi +@@ -916,21 +927,21 @@ + eval ac_new_val="\$ac_env_${ac_var}_value" + case $ac_old_set,$ac_new_set in + set,) +- { echo "$as_me:919: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++ { echo "$as_me:930: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) +- { echo "$as_me:923: error: \`$ac_var' was not set in the previous run" >&5 ++ { echo "$as_me:934: error: \`$ac_var' was not set in the previous run" >&5 + echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then +- { echo "$as_me:929: error: \`$ac_var' has changed since the previous run:" >&5 ++ { echo "$as_me:940: error: \`$ac_var' has changed since the previous run:" >&5 + echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- { echo "$as_me:931: former value: $ac_old_val" >&5 ++ { echo "$as_me:942: former value: $ac_old_val" >&5 + echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:933: current value: $ac_new_val" >&5 ++ { echo "$as_me:944: current value: $ac_new_val" >&5 + echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; +@@ -949,9 +960,9 @@ + fi + done + if $ac_cache_corrupted; then +- { echo "$as_me:952: error: changes in the environment can compromise the build" >&5 ++ { echo "$as_me:963: error: changes in the environment can compromise the build" >&5 + echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { echo "$as_me:954: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 ++ { { echo "$as_me:965: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -972,10 +983,10 @@ + echo "#! $SHELL" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh +-if { (echo "$as_me:975: PATH=\".;.\"; conftest.sh") >&5 ++if { (echo "$as_me:986: PATH=\".;.\"; conftest.sh") >&5 + (PATH=".;."; conftest.sh) 2>&5 + ac_status=$? +- echo "$as_me:978: \$? = $ac_status" >&5 ++ echo "$as_me:989: \$? = $ac_status" >&5 + (exit $ac_status); }; then + ac_path_separator=';' + else +@@ -1005,7 +1016,7 @@ + fi + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:1008: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 ++ { { echo "$as_me:1019: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1015,11 +1026,11 @@ + + # Make sure we can run config.sub. + $ac_config_sub sun4 >/dev/null 2>&1 || +- { { echo "$as_me:1018: error: cannot run $ac_config_sub" >&5 ++ { { echo "$as_me:1029: error: cannot run $ac_config_sub" >&5 + echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:1022: checking build system type" >&5 ++echo "$as_me:1033: checking build system type" >&5 + echo $ECHO_N "checking build system type... $ECHO_C" >&6 + if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1028,23 +1039,23 @@ + test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` + test -z "$ac_cv_build_alias" && +- { { echo "$as_me:1031: error: cannot guess build type; you must specify one" >&5 ++ { { echo "$as_me:1042: error: cannot guess build type; you must specify one" >&5 + echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } + ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || +- { { echo "$as_me:1035: error: $ac_config_sub $ac_cv_build_alias failed." >&5 ++ { { echo "$as_me:1046: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:1040: result: $ac_cv_build" >&5 ++echo "$as_me:1051: result: $ac_cv_build" >&5 + echo "${ECHO_T}$ac_cv_build" >&6 + build=$ac_cv_build + 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:1047: checking host system type" >&5 ++echo "$as_me:1058: checking host system type" >&5 + echo $ECHO_N "checking host system type... $ECHO_C" >&6 + if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1053,12 +1064,12 @@ + test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias + ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || +- { { echo "$as_me:1056: error: $ac_config_sub $ac_cv_host_alias failed" >&5 ++ { { echo "$as_me:1067: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:1061: result: $ac_cv_host" >&5 ++echo "$as_me:1072: result: $ac_cv_host" >&5 + echo "${ECHO_T}$ac_cv_host" >&6 + host=$ac_cv_host + host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +@@ -1066,7 +1077,7 @@ + host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then +- echo "$as_me:1069: checking target system type" >&5 ++ echo "$as_me:1080: checking target system type" >&5 + echo $ECHO_N "checking target system type... $ECHO_C" >&6 + if test "${ac_cv_target+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1075,12 +1086,12 @@ + test "x$ac_cv_target_alias" = "x" && + ac_cv_target_alias=$ac_cv_host_alias + ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || +- { { echo "$as_me:1078: error: $ac_config_sub $ac_cv_target_alias failed" >&5 ++ { { echo "$as_me:1089: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:1083: result: $ac_cv_target" >&5 ++echo "$as_me:1094: result: $ac_cv_target" >&5 + echo "${ECHO_T}$ac_cv_target" >&6 + target=$ac_cv_target + target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +@@ -1111,13 +1122,13 @@ + fi + + test -z "$system_name" && system_name="$cf_cv_system_name" +-test -n "$cf_cv_system_name" && echo "$as_me:1114: result: Configuring for $cf_cv_system_name" >&5 ++test -n "$cf_cv_system_name" && echo "$as_me:1125: result: Configuring for $cf_cv_system_name" >&5 + echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 + + if test ".$system_name" != ".$cf_cv_system_name" ; then +- echo "$as_me:1118: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 ++ echo "$as_me:1129: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 +- { { echo "$as_me:1120: error: \"Please remove config.cache and try again.\"" >&5 ++ { { echo "$as_me:1131: error: \"Please remove config.cache and try again.\"" >&5 + echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1125,7 +1136,7 @@ + # Check whether --with-system-type or --without-system-type was given. + if test "${with_system_type+set}" = set; then + withval="$with_system_type" +- { echo "$as_me:1128: WARNING: overriding system type to $withval" >&5 ++ { echo "$as_me:1139: WARNING: overriding system type to $withval" >&5 + echo "$as_me: WARNING: overriding system type to $withval" >&2;} + cf_cv_system_name=$withval + fi; +@@ -1135,23 +1146,23 @@ + + ### Default install-location + +-echo "$as_me:1138: checking for prefix" >&5 ++echo "$as_me:1149: checking for prefix" >&5 + echo $ECHO_N "checking for prefix... $ECHO_C" >&6 + if test "x$prefix" = "xNONE" ; then + case "$cf_cv_system_name" in + # non-vendor systems don't have a conflict +- openbsd*|freebsd*|linux*|cygwin*|k*bsd*-gnu) ++ openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu) + prefix=/usr + ;; + *) prefix=$ac_default_prefix + ;; + esac + fi +-echo "$as_me:1150: result: $prefix" >&5 ++echo "$as_me:1161: result: $prefix" >&5 + echo "${ECHO_T}$prefix" >&6 + + if test "x$prefix" = "xNONE" ; then +-echo "$as_me:1154: checking for default include-directory" >&5 ++echo "$as_me:1165: checking for default include-directory" >&5 + echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 + test -n "$verbose" && echo 1>&6 + for cf_symbol in \ +@@ -1174,7 +1185,7 @@ + fi + test -n "$verbose" && echo " tested $cf_dir" 1>&6 + done +-echo "$as_me:1177: result: $includedir" >&5 ++echo "$as_me:1188: result: $includedir" >&5 + echo "${ECHO_T}$includedir" >&6 + fi + +@@ -1186,213 +1197,11 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return=return + if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-echo "$as_me:1191: 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 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_CC="${ac_tool_prefix}gcc" +-echo "$as_me:1206: found $ac_dir/$ac_word" >&5 +-break +-done +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- echo "$as_me:1214: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:1217: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "gcc", so it can be a program name with args. +-set dummy gcc; ac_word=$2 +-echo "$as_me:1226: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_ac_ct_CC="gcc" +-echo "$as_me:1241: found $ac_dir/$ac_word" >&5 +-break +-done +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- echo "$as_me:1249: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 +-else +- echo "$as_me:1252: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- CC=$ac_ct_CC +-else +- CC="$ac_cv_prog_CC" +-fi +- +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}cc; ac_word=$2 +-echo "$as_me:1265: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_CC="${ac_tool_prefix}cc" +-echo "$as_me:1280: found $ac_dir/$ac_word" >&5 +-break +-done +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- echo "$as_me:1288: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:1291: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-echo "$as_me:1300: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_ac_ct_CC="cc" +-echo "$as_me:1315: found $ac_dir/$ac_word" >&5 +-break +-done +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- echo "$as_me:1323: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 +-else +- echo "$as_me:1326: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- CC=$ac_ct_CC +-else +- CC="$ac_cv_prog_CC" +-fi +- +-fi +-if test -z "$CC"; then +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-echo "$as_me:1339: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +- ac_prog_rejected=no +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +-fi +-ac_cv_prog_CC="cc" +-echo "$as_me:1359: found $ac_dir/$ac_word" >&5 +-break +-done +- +-if test $ac_prog_rejected = yes; then +- # We found a bogon in the path, so make sure we never use it. +- set dummy $ac_cv_prog_CC +- shift +- if test $# != 0; then +- # We chose a different compiler from the bogus one. +- # However, it has the same basename, so the bogon will be chosen +- # first if we set CC to just the basename; use the full file name. +- shift +- set dummy "$ac_dir/$ac_word" ${1+"$@"} +- shift +- ac_cv_prog_CC="$@" +- fi +-fi +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- echo "$as_me:1381: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:1384: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- for ac_prog in cl ++ for ac_prog in gnatgcc gcc cc + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:1395: checking for $ac_word" >&5 ++echo "$as_me:1204: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1407,7 +1216,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +-echo "$as_me:1410: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1219: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1415,10 +1224,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:1418: result: $CC" >&5 ++ echo "$as_me:1227: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else +- echo "$as_me:1421: result: no" >&5 ++ echo "$as_me:1230: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1427,11 +1236,11 @@ + fi + if test -z "$CC"; then + ac_ct_CC=$CC +- for ac_prog in cl ++ for ac_prog in gnatgcc gcc cc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:1434: checking for $ac_word" >&5 ++echo "$as_me:1243: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1446,7 +1255,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_CC="$ac_prog" +-echo "$as_me:1449: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1258: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1454,10 +1263,10 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:1457: result: $ac_ct_CC" >&5 ++ echo "$as_me:1266: result: $ac_ct_CC" >&5 + echo "${ECHO_T}$ac_ct_CC" >&6 + else +- echo "$as_me:1460: result: no" >&5 ++ echo "$as_me:1269: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1467,34 +1276,32 @@ + CC=$ac_ct_CC + fi + +-fi +- +-test -z "$CC" && { { echo "$as_me:1472: error: no acceptable cc found in \$PATH" >&5 ++test -z "$CC" && { { echo "$as_me:1279: 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:1477:" \ ++echo "$as_me:1284:" \ + "checking for C compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:1480: \"$ac_compiler --version &5\"") >&5 ++{ (eval echo "$as_me:1287: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? +- echo "$as_me:1483: \$? = $ac_status" >&5 ++ echo "$as_me:1290: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:1485: \"$ac_compiler -v &5\"") >&5 ++{ (eval echo "$as_me:1292: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? +- echo "$as_me:1488: \$? = $ac_status" >&5 ++ echo "$as_me:1295: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:1490: \"$ac_compiler -V &5\"") >&5 ++{ (eval echo "$as_me:1297: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? +- echo "$as_me:1493: \$? = $ac_status" >&5 ++ echo "$as_me:1300: \$? = $ac_status" >&5 + (exit $ac_status); } + + cat >conftest.$ac_ext <<_ACEOF +-#line 1497 "configure" ++#line 1304 "configure" + #include "confdefs.h" + + int +@@ -1510,13 +1317,13 @@ + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-echo "$as_me:1513: checking for C compiler default output" >&5 ++echo "$as_me:1320: checking for C compiler default output" >&5 + echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 + ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +-if { (eval echo "$as_me:1516: \"$ac_link_default\"") >&5 ++if { (eval echo "$as_me:1323: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? +- echo "$as_me:1519: \$? = $ac_status" >&5 ++ echo "$as_me:1326: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Find the output, starting from the most likely. This scheme is + # not robust to junk in `.', hence go to wildcards (a.*) only as a last +@@ -1539,34 +1346,34 @@ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-{ { echo "$as_me:1542: error: C compiler cannot create executables" >&5 ++{ { echo "$as_me:1349: 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:1548: result: $ac_file" >&5 ++echo "$as_me:1355: 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:1553: checking whether the C compiler works" >&5 ++echo "$as_me:1360: checking whether the C compiler works" >&5 + echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 + # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # 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:1559: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1366: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1562: \$? = $ac_status" >&5 ++ echo "$as_me:1369: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { echo "$as_me:1569: error: cannot run C compiled programs. ++ { { echo "$as_me:1376: error: cannot run C compiled programs. + If you meant to cross compile, use \`--host'." >&5 + echo "$as_me: error: cannot run C compiled programs. + If you meant to cross compile, use \`--host'." >&2;} +@@ -1574,24 +1381,24 @@ + fi + fi + fi +-echo "$as_me:1577: result: yes" >&5 ++echo "$as_me:1384: 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:1584: checking whether we are cross compiling" >&5 ++echo "$as_me:1391: checking whether we are cross compiling" >&5 + echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +-echo "$as_me:1586: result: $cross_compiling" >&5 ++echo "$as_me:1393: result: $cross_compiling" >&5 + echo "${ECHO_T}$cross_compiling" >&6 + +-echo "$as_me:1589: checking for executable suffix" >&5 ++echo "$as_me:1396: checking for executable suffix" >&5 + echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 +-if { (eval echo "$as_me:1591: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:1398: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:1594: \$? = $ac_status" >&5 ++ echo "$as_me:1401: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +@@ -1607,25 +1414,25 @@ + esac + done + else +- { { echo "$as_me:1610: error: cannot compute EXEEXT: cannot compile and link" >&5 ++ { { echo "$as_me:1417: error: cannot compute EXEEXT: cannot compile and link" >&5 + echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { (exit 1); exit 1; }; } + fi + + rm -f conftest$ac_cv_exeext +-echo "$as_me:1616: result: $ac_cv_exeext" >&5 ++echo "$as_me:1423: 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:1622: checking for object suffix" >&5 ++echo "$as_me:1429: checking for object suffix" >&5 + echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 + if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1628 "configure" ++#line 1435 "configure" + #include "confdefs.h" + + int +@@ -1637,10 +1444,10 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (eval echo "$as_me:1640: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1447: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1643: \$? = $ac_status" >&5 ++ echo "$as_me:1450: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + case $ac_file in +@@ -1652,24 +1459,24 @@ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-{ { echo "$as_me:1655: error: cannot compute OBJEXT: cannot compile" >&5 ++{ { echo "$as_me:1462: 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:1662: result: $ac_cv_objext" >&5 ++echo "$as_me:1469: result: $ac_cv_objext" >&5 + echo "${ECHO_T}$ac_cv_objext" >&6 + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-echo "$as_me:1666: checking whether we are using the GNU C compiler" >&5 ++echo "$as_me:1473: checking whether we are using the GNU C compiler" >&5 + echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 + if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1672 "configure" ++#line 1479 "configure" + #include "confdefs.h" + + int +@@ -1684,16 +1491,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1687: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1494: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1690: \$? = $ac_status" >&5 ++ echo "$as_me:1497: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1693: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1500: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1696: \$? = $ac_status" >&5 ++ echo "$as_me:1503: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes + else +@@ -1705,19 +1512,19 @@ + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:1708: result: $ac_cv_c_compiler_gnu" >&5 ++echo "$as_me:1515: result: $ac_cv_c_compiler_gnu" >&5 + echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 + GCC=`test $ac_compiler_gnu = yes && echo yes` + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS + CFLAGS="-g" +-echo "$as_me:1714: checking whether $CC accepts -g" >&5 ++echo "$as_me:1521: checking whether $CC accepts -g" >&5 + echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 + if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1720 "configure" ++#line 1527 "configure" + #include "confdefs.h" + + int +@@ -1729,16 +1536,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1732: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1539: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1735: \$? = $ac_status" >&5 ++ echo "$as_me:1542: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1738: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1545: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1741: \$? = $ac_status" >&5 ++ echo "$as_me:1548: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes + else +@@ -1748,7 +1555,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:1751: result: $ac_cv_prog_cc_g" >&5 ++echo "$as_me:1558: result: $ac_cv_prog_cc_g" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +@@ -1775,16 +1582,16 @@ + #endif + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1778: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1585: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1781: \$? = $ac_status" >&5 ++ echo "$as_me:1588: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1784: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1591: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1787: \$? = $ac_status" >&5 ++ echo "$as_me:1594: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + ''\ +@@ -1796,7 +1603,7 @@ + 'void exit (int);' + do + cat >conftest.$ac_ext <<_ACEOF +-#line 1799 "configure" ++#line 1606 "configure" + #include "confdefs.h" + #include + $ac_declaration +@@ -1809,16 +1616,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1812: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1619: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1815: \$? = $ac_status" >&5 ++ echo "$as_me:1622: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1818: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1625: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1821: \$? = $ac_status" >&5 ++ echo "$as_me:1628: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -1828,7 +1635,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 1831 "configure" ++#line 1638 "configure" + #include "confdefs.h" + $ac_declaration + int +@@ -1840,16 +1647,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1843: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1650: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1846: \$? = $ac_status" >&5 ++ echo "$as_me:1653: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1849: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1656: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1852: \$? = $ac_status" >&5 ++ echo "$as_me:1659: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -1879,11 +1686,11 @@ + + GCC_VERSION=none + if test "$GCC" = yes ; then +- echo "$as_me:1882: checking version of $CC" >&5 ++ echo "$as_me:1689: checking version of $CC" >&5 + echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$GCC_VERSION" && GCC_VERSION=unknown +- echo "$as_me:1886: result: $GCC_VERSION" >&5 ++ echo "$as_me:1693: result: $GCC_VERSION" >&5 + echo "${ECHO_T}$GCC_VERSION" >&6 + fi + +@@ -1893,7 +1700,7 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return=return +-echo "$as_me:1896: checking how to run the C preprocessor" >&5 ++echo "$as_me:1703: checking how to run the C preprocessor" >&5 + echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then +@@ -1914,18 +1721,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line 1917 "configure" ++#line 1724 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:1922: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1729: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:1928: \$? = $ac_status" >&5 ++ echo "$as_me:1735: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -1948,17 +1755,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 1951 "configure" ++#line 1758 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:1955: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1762: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:1961: \$? = $ac_status" >&5 ++ echo "$as_me:1768: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -1995,7 +1802,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-echo "$as_me:1998: result: $CPP" >&5 ++echo "$as_me:1805: result: $CPP" >&5 + echo "${ECHO_T}$CPP" >&6 + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -2005,18 +1812,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line 2008 "configure" ++#line 1815 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:2013: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1820: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:2019: \$? = $ac_status" >&5 ++ echo "$as_me:1826: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2039,17 +1846,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 2042 "configure" ++#line 1849 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:2046: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1853: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:2052: \$? = $ac_status" >&5 ++ echo "$as_me:1859: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2077,7 +1884,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:2080: error: C preprocessor \"$CPP\" fails sanity check" >&5 ++ { { echo "$as_me:1887: error: C preprocessor \"$CPP\" fails sanity check" >&5 + echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -2090,14 +1897,14 @@ + ac_main_return=return + + if test $ac_cv_c_compiler_gnu = yes; then +- echo "$as_me:2093: checking whether $CC needs -traditional" >&5 ++ echo "$as_me:1900: checking whether $CC needs -traditional" >&5 + echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 + if test "${ac_cv_prog_gcc_traditional+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_pattern="Autoconf.*'x'" + cat >conftest.$ac_ext <<_ACEOF +-#line 2100 "configure" ++#line 1907 "configure" + #include "confdefs.h" + #include + int Autoconf = TIOCGETP; +@@ -2112,7 +1919,7 @@ + + if test $ac_cv_prog_gcc_traditional = no; then + cat >conftest.$ac_ext <<_ACEOF +-#line 2115 "configure" ++#line 1922 "configure" + #include "confdefs.h" + #include + int Autoconf = TCGETA; +@@ -2125,14 +1932,14 @@ + + fi + fi +-echo "$as_me:2128: result: $ac_cv_prog_gcc_traditional" >&5 ++echo "$as_me:1935: result: $ac_cv_prog_gcc_traditional" >&5 + echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 + if test $ac_cv_prog_gcc_traditional = yes; then + CC="$CC -traditional" + fi + fi + +-echo "$as_me:2135: checking whether $CC understands -c and -o together" >&5 ++echo "$as_me:1942: checking whether $CC understands -c and -o together" >&5 + echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 + if test "${cf_cv_prog_CC_c_o+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2148,15 +1955,15 @@ + # We do the test twice because some compilers refuse to overwrite an + # existing .o file with -o, though they will create one. + ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +-if { (eval echo "$as_me:2151: \"$ac_try\"") >&5 ++if { (eval echo "$as_me:1958: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2154: \$? = $ac_status" >&5 ++ echo "$as_me:1961: \$? = $ac_status" >&5 + (exit $ac_status); } && +- test -f conftest2.$ac_objext && { (eval echo "$as_me:2156: \"$ac_try\"") >&5 ++ test -f conftest2.$ac_objext && { (eval echo "$as_me:1963: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2159: \$? = $ac_status" >&5 ++ echo "$as_me:1966: \$? = $ac_status" >&5 + (exit $ac_status); }; + then + eval cf_cv_prog_CC_c_o=yes +@@ -2167,19 +1974,19 @@ + + fi + if test $cf_cv_prog_CC_c_o = yes; then +- echo "$as_me:2170: result: yes" >&5 ++ echo "$as_me:1977: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:2173: result: no" >&5 ++ echo "$as_me:1980: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:2177: checking for POSIXized ISC" >&5 ++echo "$as_me:1984: checking for POSIXized ISC" >&5 + echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 + if test -d /etc/conf/kconfig.d && + grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 + then +- echo "$as_me:2182: result: yes" >&5 ++ echo "$as_me:1989: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + ISC=yes # If later tests want to check for ISC. + +@@ -2193,12 +2000,115 @@ + CC="$CC -Xp" + fi + else +- echo "$as_me:2196: result: no" >&5 ++ echo "$as_me:2003: result: no" >&5 + echo "${ECHO_T}no" >&6 + ISC= + fi + +-echo "$as_me:2201: checking for ${CC:-cc} option to accept ANSI C" >&5 ++# This should have been defined by AC_PROG_CC ++: ${CC:=cc} ++ ++# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content ++# into CC. This will not help with broken scripts that wrap the compiler with ++# options, but eliminates a more common category of user confusion. ++echo "$as_me:2014: checking \$CC variable" >&5 ++echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 ++case "$CC" in #(vi ++*[\ \ ]-[IUD]*) ++ echo "$as_me:2018: result: broken" >&5 ++echo "${ECHO_T}broken" >&6 ++ { echo "$as_me:2020: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 ++echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} ++ # humor him... ++ cf_flags=`echo "$CC" | sed -e 's/^[^ ]*[ ]//'` ++ CC=`echo "$CC" | sed -e 's/[ ].*//'` ++ ++cf_fix_cppflags=no ++cf_new_cflags= ++cf_new_cppflags= ++cf_new_extra_cppflags= ++ ++for cf_add_cflags in $cf_flags ++do ++case $cf_fix_cppflags in ++no) ++ case $cf_add_cflags in #(vi ++ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi ++ case $cf_add_cflags in ++ -D*) ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=yes ++ ++ if test $cf_fix_cppflags = yes ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ elif test "${cf_tst_cflags}" = "\"'" ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ fi ++ ;; ++ esac ++ case "$CPPFLAGS" in ++ *$cf_add_cflags) #(vi ++ ;; ++ *) #(vi ++ case $cf_add_cflags in #(vi ++ -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 ++ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++ *) ++ cf_new_cflags="$cf_new_cflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++yes) ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=no ++ ;; ++esac ++done ++ ++if test -n "$cf_new_cflags" ; then ++ ++ CFLAGS="$CFLAGS $cf_new_cflags" ++fi ++ ++if test -n "$cf_new_cppflags" ; then ++ ++ CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++fi ++ ++if test -n "$cf_new_extra_cppflags" ; then ++ ++ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" ++fi ++ ++ ;; ++*) ++ echo "$as_me:2106: result: ok" >&5 ++echo "${ECHO_T}ok" >&6 ++ ;; ++esac ++ ++echo "$as_me:2111: checking for ${CC:-cc} option to accept ANSI C" >&5 + echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6 + if test "${cf_cv_ansi_cc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2302,7 +2212,7 @@ + fi + + cat >conftest.$ac_ext <<_ACEOF +-#line 2305 "configure" ++#line 2215 "configure" + #include "confdefs.h" + + #ifndef CC_HAS_PROTOS +@@ -2323,16 +2233,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2326: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2236: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2329: \$? = $ac_status" >&5 ++ echo "$as_me:2239: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2332: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2242: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2335: \$? = $ac_status" >&5 ++ echo "$as_me:2245: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ansi_cc="$cf_arg"; break + else +@@ -2345,7 +2255,7 @@ + CPPFLAGS="$cf_save_CPPFLAGS" + + fi +-echo "$as_me:2348: result: $cf_cv_ansi_cc" >&5 ++echo "$as_me:2258: result: $cf_cv_ansi_cc" >&5 + echo "${ECHO_T}$cf_cv_ansi_cc" >&6 + + if test "$cf_cv_ansi_cc" != "no"; then +@@ -2438,7 +2348,7 @@ + fi + + if test "$cf_cv_ansi_cc" = "no"; then +- { { echo "$as_me:2441: error: Your compiler does not appear to recognize prototypes. ++ { { echo "$as_me:2351: error: Your compiler does not appear to recognize prototypes. + You have the following choices: + a. adjust your compiler options + b. get an up-to-date compiler +@@ -2485,7 +2395,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:2488: checking for $ac_word" >&5 ++echo "$as_me:2398: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2500,7 +2410,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AWK="$ac_prog" +-echo "$as_me:2503: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2413: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2508,21 +2418,21 @@ + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- echo "$as_me:2511: result: $AWK" >&5 ++ echo "$as_me:2421: result: $AWK" >&5 + echo "${ECHO_T}$AWK" >&6 + else +- echo "$as_me:2514: result: no" >&5 ++ echo "$as_me:2424: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$AWK" && break + done + +-test -z "$AWK" && { { echo "$as_me:2521: error: No awk program found" >&5 ++test -z "$AWK" && { { echo "$as_me:2431: error: No awk program found" >&5 + echo "$as_me: error: No awk program found" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:2525: checking for egrep" >&5 ++echo "$as_me:2435: checking for egrep" >&5 + echo $ECHO_N "checking for egrep... $ECHO_C" >&6 + if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2532,11 +2442,11 @@ + else ac_cv_prog_egrep='egrep' + fi + fi +-echo "$as_me:2535: result: $ac_cv_prog_egrep" >&5 ++echo "$as_me:2445: result: $ac_cv_prog_egrep" >&5 + echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep + +-test -z "$EGREP" && { { echo "$as_me:2539: error: No egrep program found" >&5 ++test -z "$EGREP" && { { echo "$as_me:2449: error: No egrep program found" >&5 + echo "$as_me: error: No egrep program found" >&2;} + { (exit 1); exit 1; }; } + +@@ -2552,7 +2462,7 @@ + # AFS /usr/afsws/bin/install, which mishandles nonexistent args + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. +-echo "$as_me:2555: checking for a BSD compatible install" >&5 ++echo "$as_me:2465: checking for a BSD compatible install" >&5 + echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 + if test -z "$INSTALL"; then + if test "${ac_cv_path_install+set}" = set; then +@@ -2601,7 +2511,7 @@ + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:2604: result: $INSTALL" >&5 ++echo "$as_me:2514: result: $INSTALL" >&5 + echo "${ECHO_T}$INSTALL" >&6 + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -2612,18 +2522,18 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-echo "$as_me:2615: checking whether ln -s works" >&5 ++echo "$as_me:2525: checking whether ln -s works" >&5 + echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +- echo "$as_me:2619: result: yes" >&5 ++ echo "$as_me:2529: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:2622: result: no, using $LN_S" >&5 ++ echo "$as_me:2532: result: no, using $LN_S" >&5 + echo "${ECHO_T}no, using $LN_S" >&6 + fi + +-echo "$as_me:2626: checking if $LN_S -f options work" >&5 ++echo "$as_me:2536: checking if $LN_S -f options work" >&5 + echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6 + + rm -f conf$$.src conf$$dst +@@ -2635,12 +2545,12 @@ + cf_prog_ln_sf=no + fi + rm -f conf$$.dst conf$$src +-echo "$as_me:2638: result: $cf_prog_ln_sf" >&5 ++echo "$as_me:2548: 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:2643: checking for long file names" >&5 ++echo "$as_me:2553: checking for long file names" >&5 + echo $ECHO_N "checking for long file names... $ECHO_C" >&6 + if test "${ac_cv_sys_long_file_names+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2679,7 +2589,7 @@ + rm -rf $ac_xdir 2>/dev/null + done + fi +-echo "$as_me:2682: result: $ac_cv_sys_long_file_names" >&5 ++echo "$as_me:2592: result: $ac_cv_sys_long_file_names" >&5 + echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 + if test $ac_cv_sys_long_file_names = yes; then + +@@ -2691,7 +2601,7 @@ + + # if we find pkg-config, check if we should install the ".pc" files. + +-echo "$as_me:2694: checking if you want to use pkg-config" >&5 ++echo "$as_me:2604: checking if you want to use pkg-config" >&5 + echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 + + # Check whether --with-pkg-config or --without-pkg-config was given. +@@ -2701,7 +2611,7 @@ + else + cf_pkg_config=yes + fi; +-echo "$as_me:2704: result: $cf_pkg_config" >&5 ++echo "$as_me:2614: result: $cf_pkg_config" >&5 + echo "${ECHO_T}$cf_pkg_config" >&6 + + case $cf_pkg_config in #(vi +@@ -2709,10 +2619,11 @@ + PKG_CONFIG=none + ;; + yes) #(vi +- if test -n "$ac_tool_prefix"; then ++ ++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:2715: checking for $ac_word" >&5 ++echo "$as_me:2626: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2729,7 +2640,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:2732: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:2643: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -2740,10 +2651,10 @@ + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + + if test -n "$PKG_CONFIG"; then +- echo "$as_me:2743: result: $PKG_CONFIG" >&5 ++ echo "$as_me:2654: result: $PKG_CONFIG" >&5 + echo "${ECHO_T}$PKG_CONFIG" >&6 + else +- echo "$as_me:2746: result: no" >&5 ++ echo "$as_me:2657: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2752,7 +2663,7 @@ + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 +-echo "$as_me:2755: checking for $ac_word" >&5 ++echo "$as_me:2666: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2769,7 +2680,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:2772: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:2683: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -2781,10 +2692,10 @@ + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + + if test -n "$ac_pt_PKG_CONFIG"; then +- echo "$as_me:2784: result: $ac_pt_PKG_CONFIG" >&5 ++ echo "$as_me:2695: result: $ac_pt_PKG_CONFIG" >&5 + echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 + else +- echo "$as_me:2787: result: no" >&5 ++ echo "$as_me:2698: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2815,7 +2726,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval PKG_CONFIG="$PKG_CONFIG" + case ".$PKG_CONFIG" in #(vi + .NONE/*) +@@ -2827,7 +2738,7 @@ + PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:2830: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 ++ { { echo "$as_me:2741: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -2836,35 +2747,100 @@ + fi + + if test "$PKG_CONFIG" != none ; then +- echo "$as_me:2839: checking if we should install .pc files for $PKG_CONFIG" >&5 +-echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 ++ echo "$as_me:2750: checking for $PKG_CONFIG library directory" >&5 ++echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 + +- # Leave this as something that can be overridden in the environment. +- if test -z "$PKG_CONFIG_LIBDIR" ; then +- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig +- fi +- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'` +- if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then +- +-# Check whether --enable-pc-files or --disable-pc-files was given. +-if test "${enable_pc_files+set}" = set; then +- enableval="$enable_pc_files" +- enable_pc_files=$enableval ++# Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given. ++if test "${with_pkg_config_libdir+set}" = set; then ++ withval="$with_pkg_config_libdir" ++ PKG_CONFIG_LIBDIR=$withval + else +- enable_pc_files=no ++ PKG_CONFIG_LIBDIR=yes + fi; +- echo "$as_me:2856: result: $enable_pc_files" >&5 +-echo "${ECHO_T}$enable_pc_files" >&6 +- else +- echo "$as_me:2859: result: no" >&5 +-echo "${ECHO_T}no" >&6 +- { echo "$as_me:2861: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5 +-echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;} +- enable_pc_files=no +- fi +-fi + +-echo "$as_me:2867: checking if you want to build test-programs" >&5 ++ case x$PKG_CONFIG_LIBDIR in #(vi ++ x/*) #(vi ++ ;; ++ xyes) #(vi ++ # look for the library directory using the same prefix as the executable ++ cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'` ++ case x`(arch) 2>/dev/null` in #(vi ++ *64) #(vi ++ for cf_config in $cf_path/share $cf_path/lib64 $cf_path/lib32 $cf_path/lib ++ do ++ if test -d $cf_config/pkgconfig ++ then ++ PKG_CONFIG_LIBDIR=$cf_config/pkgconfig ++ break ++ fi ++ done ++ ;; ++ *) ++ PKG_CONFIG_LIBDIR=$cf_path/lib/pkgconfig ++ ;; ++ esac ++ ;; ++ *) ++ ;; ++ esac ++ ++ echo "$as_me:2787: result: $PKG_CONFIG_LIBDIR" >&5 ++echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 ++fi ++ ++if test "$PKG_CONFIG" != none ; then ++ echo "$as_me:2792: checking if we should install .pc files for $PKG_CONFIG" >&5 ++echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 ++ ++# Check whether --enable-pc-files or --disable-pc-files was given. ++if test "${enable_pc_files+set}" = set; then ++ enableval="$enable_pc_files" ++ enable_pc_files=$enableval ++else ++ enable_pc_files=no ++fi; ++ echo "$as_me:2802: result: $enable_pc_files" >&5 ++echo "${ECHO_T}$enable_pc_files" >&6 ++ if test "$enable_pc_files" != no ++ then ++ ++if test "x$prefix" != xNONE; then ++ cf_path_syntax="$prefix" ++else ++ cf_path_syntax="$ac_default_prefix" ++fi ++ ++case ".$PKG_CONFIG_LIBDIR" in #(vi ++.\$\(*\)*|.\'*\'*) #(vi ++ ;; ++..|./*|.\\*) #(vi ++ ;; ++.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ++ ;; ++.\${*prefix}*|.\${*dir}*) #(vi ++ eval PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" ++ case ".$PKG_CONFIG_LIBDIR" in #(vi ++ .NONE/*) ++ PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%` ++ ;; ++ esac ++ ;; #(vi ++.no|.NONE/*) ++ PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%` ++ ;; ++*) ++ { { echo "$as_me:2832: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 ++echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;} ++ { (exit 1); exit 1; }; } ++ ;; ++esac ++ ++ fi ++else ++ enable_pc_files=no ++fi ++ ++echo "$as_me:2843: checking if you want to build test-programs" >&5 + echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 + + # Check whether --with-tests or --without-tests was given. +@@ -2874,10 +2850,10 @@ + else + cf_with_tests=yes + fi; +-echo "$as_me:2877: result: $cf_with_tests" >&5 ++echo "$as_me:2853: result: $cf_with_tests" >&5 + echo "${ECHO_T}$cf_with_tests" >&6 + +-echo "$as_me:2880: checking if we should assume mixed-case filenames" >&5 ++echo "$as_me:2856: checking if we should assume mixed-case filenames" >&5 + echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 + + # Check whether --enable-mixed-case or --disable-mixed-case was given. +@@ -2887,11 +2863,11 @@ + else + enable_mixedcase=auto + fi; +-echo "$as_me:2890: result: $enable_mixedcase" >&5 ++echo "$as_me:2866: result: $enable_mixedcase" >&5 + echo "${ECHO_T}$enable_mixedcase" >&6 + if test "$enable_mixedcase" = "auto" ; then + +-echo "$as_me:2894: checking if filesystem supports mixed-case filenames" >&5 ++echo "$as_me:2870: checking if filesystem supports mixed-case filenames" >&5 + echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 + if test "${cf_cv_mixedcase+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2918,7 +2894,7 @@ + fi + + fi +-echo "$as_me:2921: result: $cf_cv_mixedcase" >&5 ++echo "$as_me:2897: result: $cf_cv_mixedcase" >&5 + echo "${ECHO_T}$cf_cv_mixedcase" >&6 + test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF + #define MIXEDCASE_FILENAMES 1 +@@ -2935,7 +2911,7 @@ + fi + + # do this after mixed-case option (tags/TAGS is not as important as tic). +-echo "$as_me:2938: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "$as_me:2914: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` + if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +@@ -2955,11 +2931,11 @@ + rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:2958: result: yes" >&5 ++ echo "$as_me:2934: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + SET_MAKE= + else +- echo "$as_me:2962: result: no" >&5 ++ echo "$as_me:2938: result: no" >&5 + echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi +@@ -2968,7 +2944,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:2971: checking for $ac_word" >&5 ++echo "$as_me:2947: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CTAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2983,7 +2959,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CTAGS="$ac_prog" +-echo "$as_me:2986: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2962: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2991,10 +2967,10 @@ + fi + CTAGS=$ac_cv_prog_CTAGS + if test -n "$CTAGS"; then +- echo "$as_me:2994: result: $CTAGS" >&5 ++ echo "$as_me:2970: result: $CTAGS" >&5 + echo "${ECHO_T}$CTAGS" >&6 + else +- echo "$as_me:2997: result: no" >&5 ++ echo "$as_me:2973: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3005,7 +2981,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:3008: checking for $ac_word" >&5 ++echo "$as_me:2984: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ETAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3020,7 +2996,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ETAGS="$ac_prog" +-echo "$as_me:3023: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2999: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3028,10 +3004,10 @@ + fi + ETAGS=$ac_cv_prog_ETAGS + if test -n "$ETAGS"; then +- echo "$as_me:3031: result: $ETAGS" >&5 ++ echo "$as_me:3007: result: $ETAGS" >&5 + echo "${ECHO_T}$ETAGS" >&6 + else +- echo "$as_me:3034: result: no" >&5 ++ echo "$as_me:3010: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3040,7 +3016,7 @@ + + # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. + set dummy ${CTAGS:-ctags}; ac_word=$2 +-echo "$as_me:3043: checking for $ac_word" >&5 ++echo "$as_me:3019: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3055,7 +3031,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_LOWER_TAGS="yes" +-echo "$as_me:3058: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3034: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3064,17 +3040,17 @@ + fi + MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS + if test -n "$MAKE_LOWER_TAGS"; then +- echo "$as_me:3067: result: $MAKE_LOWER_TAGS" >&5 ++ echo "$as_me:3043: result: $MAKE_LOWER_TAGS" >&5 + echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 + else +- echo "$as_me:3070: result: no" >&5 ++ echo "$as_me:3046: 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:3077: checking for $ac_word" >&5 ++echo "$as_me:3053: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3089,7 +3065,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_UPPER_TAGS="yes" +-echo "$as_me:3092: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3068: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3098,10 +3074,10 @@ + fi + MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS + if test -n "$MAKE_UPPER_TAGS"; then +- echo "$as_me:3101: result: $MAKE_UPPER_TAGS" >&5 ++ echo "$as_me:3077: result: $MAKE_UPPER_TAGS" >&5 + echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 + else +- echo "$as_me:3104: result: no" >&5 ++ echo "$as_me:3080: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3121,7 +3097,7 @@ + MAKE_LOWER_TAGS="#" + fi + +-echo "$as_me:3124: checking for makeflags variable" >&5 ++echo "$as_me:3100: checking for makeflags variable" >&5 + echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 + if test "${cf_cv_makeflags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3155,13 +3131,13 @@ + rm -f cf_makeflags.tmp + + fi +-echo "$as_me:3158: result: $cf_cv_makeflags" >&5 ++echo "$as_me:3134: 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:3164: checking for $ac_word" >&5 ++echo "$as_me:3140: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3176,7 +3152,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +-echo "$as_me:3179: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3155: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3184,10 +3160,10 @@ + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$as_me:3187: result: $RANLIB" >&5 ++ echo "$as_me:3163: result: $RANLIB" >&5 + echo "${ECHO_T}$RANLIB" >&6 + else +- echo "$as_me:3190: result: no" >&5 ++ echo "$as_me:3166: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3196,7 +3172,7 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-echo "$as_me:3199: checking for $ac_word" >&5 ++echo "$as_me:3175: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3211,7 +3187,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_RANLIB="ranlib" +-echo "$as_me:3214: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3190: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3220,10 +3196,10 @@ + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:3223: result: $ac_ct_RANLIB" >&5 ++ echo "$as_me:3199: result: $ac_ct_RANLIB" >&5 + echo "${ECHO_T}$ac_ct_RANLIB" >&6 + else +- echo "$as_me:3226: result: no" >&5 ++ echo "$as_me:3202: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3235,7 +3211,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. + set dummy ${ac_tool_prefix}ld; ac_word=$2 +-echo "$as_me:3238: checking for $ac_word" >&5 ++echo "$as_me:3214: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3250,7 +3226,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LD="${ac_tool_prefix}ld" +-echo "$as_me:3253: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3229: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3258,10 +3234,10 @@ + fi + LD=$ac_cv_prog_LD + if test -n "$LD"; then +- echo "$as_me:3261: result: $LD" >&5 ++ echo "$as_me:3237: result: $LD" >&5 + echo "${ECHO_T}$LD" >&6 + else +- echo "$as_me:3264: result: no" >&5 ++ echo "$as_me:3240: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3270,7 +3246,7 @@ + ac_ct_LD=$LD + # Extract the first word of "ld", so it can be a program name with args. + set dummy ld; ac_word=$2 +-echo "$as_me:3273: checking for $ac_word" >&5 ++echo "$as_me:3249: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3285,7 +3261,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_LD="ld" +-echo "$as_me:3288: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3264: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3294,10 +3270,10 @@ + fi + ac_ct_LD=$ac_cv_prog_ac_ct_LD + if test -n "$ac_ct_LD"; then +- echo "$as_me:3297: result: $ac_ct_LD" >&5 ++ echo "$as_me:3273: result: $ac_ct_LD" >&5 + echo "${ECHO_T}$ac_ct_LD" >&6 + else +- echo "$as_me:3300: result: no" >&5 ++ echo "$as_me:3276: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3309,7 +3285,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-echo "$as_me:3312: checking for $ac_word" >&5 ++echo "$as_me:3288: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3324,7 +3300,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:3327: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3303: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3332,10 +3308,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:3335: result: $AR" >&5 ++ echo "$as_me:3311: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:3338: result: no" >&5 ++ echo "$as_me:3314: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3344,7 +3320,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:3347: checking for $ac_word" >&5 ++echo "$as_me:3323: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3359,7 +3335,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:3362: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3338: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3368,10 +3344,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:3371: result: $ac_ct_AR" >&5 ++ echo "$as_me:3347: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:3374: result: no" >&5 ++ echo "$as_me:3350: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3383,7 +3359,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-echo "$as_me:3386: checking for $ac_word" >&5 ++echo "$as_me:3362: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3398,7 +3374,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:3401: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3377: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3406,10 +3382,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:3409: result: $AR" >&5 ++ echo "$as_me:3385: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:3412: result: no" >&5 ++ echo "$as_me:3388: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3418,7 +3394,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:3421: checking for $ac_word" >&5 ++echo "$as_me:3397: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3433,7 +3409,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:3436: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3412: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3442,10 +3418,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:3445: result: $ac_ct_AR" >&5 ++ echo "$as_me:3421: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:3448: result: no" >&5 ++ echo "$as_me:3424: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3454,7 +3430,7 @@ + AR="$ac_cv_prog_AR" + fi + +-echo "$as_me:3457: checking for options to update archives" >&5 ++echo "$as_me:3433: checking for options to update archives" >&5 + echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 + if test "${cf_cv_ar_flags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3477,13 +3453,13 @@ + rm -f conftest.a + + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:3459: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3486: \$? = $ac_status" >&5 ++ echo "$as_me:3462: \$? = $ac_status" >&5 + (exit $ac_status); } ; then + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 + $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null +@@ -3494,7 +3470,7 @@ + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 + +-echo "${as_me:-configure}:3497: testing cannot compile test-program ..." 1>&5 ++echo "${as_me:-configure}:3473: testing cannot compile test-program ..." 1>&5 + + break + fi +@@ -3502,7 +3478,7 @@ + rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext + + fi +-echo "$as_me:3505: result: $cf_cv_ar_flags" >&5 ++echo "$as_me:3481: result: $cf_cv_ar_flags" >&5 + echo "${ECHO_T}$cf_cv_ar_flags" >&6 + + if test -n "$ARFLAGS" ; then +@@ -3513,7 +3489,7 @@ + ARFLAGS=$cf_cv_ar_flags + fi + +-echo "$as_me:3516: checking if you have specified an install-prefix" >&5 ++echo "$as_me:3492: checking if you have specified an install-prefix" >&5 + echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 + + # Check whether --with-install-prefix or --without-install-prefix was given. +@@ -3526,7 +3502,7 @@ + ;; + esac + fi; +-echo "$as_me:3529: result: $DESTDIR" >&5 ++echo "$as_me:3505: result: $DESTDIR" >&5 + echo "${ECHO_T}$DESTDIR" >&6 + + ############################################################################### +@@ -3554,7 +3530,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:3557: checking for $ac_word" >&5 ++echo "$as_me:3533: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_BUILD_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3569,7 +3545,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_BUILD_CC="$ac_prog" +-echo "$as_me:3572: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3548: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3577,10 +3553,10 @@ + fi + BUILD_CC=$ac_cv_prog_BUILD_CC + if test -n "$BUILD_CC"; then +- echo "$as_me:3580: result: $BUILD_CC" >&5 ++ echo "$as_me:3556: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + else +- echo "$as_me:3583: result: no" >&5 ++ echo "$as_me:3559: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3588,12 +3564,12 @@ + done + + fi; +- echo "$as_me:3591: checking for native build C compiler" >&5 ++ echo "$as_me:3567: checking for native build C compiler" >&5 + echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 +- echo "$as_me:3593: result: $BUILD_CC" >&5 ++ echo "$as_me:3569: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + +- echo "$as_me:3596: checking for native build C preprocessor" >&5 ++ echo "$as_me:3572: checking for native build C preprocessor" >&5 + echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 + + # Check whether --with-build-cpp or --without-build-cpp was given. +@@ -3603,10 +3579,10 @@ + else + BUILD_CPP='${BUILD_CC} -E' + fi; +- echo "$as_me:3606: result: $BUILD_CPP" >&5 ++ echo "$as_me:3582: result: $BUILD_CPP" >&5 + echo "${ECHO_T}$BUILD_CPP" >&6 + +- echo "$as_me:3609: checking for native build C flags" >&5 ++ echo "$as_me:3585: checking for native build C flags" >&5 + echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 + + # Check whether --with-build-cflags or --without-build-cflags was given. +@@ -3614,10 +3590,10 @@ + withval="$with_build_cflags" + BUILD_CFLAGS="$withval" + fi; +- echo "$as_me:3617: result: $BUILD_CFLAGS" >&5 ++ echo "$as_me:3593: result: $BUILD_CFLAGS" >&5 + echo "${ECHO_T}$BUILD_CFLAGS" >&6 + +- echo "$as_me:3620: checking for native build C preprocessor-flags" >&5 ++ echo "$as_me:3596: checking for native build C preprocessor-flags" >&5 + echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 + + # Check whether --with-build-cppflags or --without-build-cppflags was given. +@@ -3625,10 +3601,10 @@ + withval="$with_build_cppflags" + BUILD_CPPFLAGS="$withval" + fi; +- echo "$as_me:3628: result: $BUILD_CPPFLAGS" >&5 ++ echo "$as_me:3604: result: $BUILD_CPPFLAGS" >&5 + echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 + +- echo "$as_me:3631: checking for native build linker-flags" >&5 ++ echo "$as_me:3607: checking for native build linker-flags" >&5 + echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 + + # Check whether --with-build-ldflags or --without-build-ldflags was given. +@@ -3636,10 +3612,10 @@ + withval="$with_build_ldflags" + BUILD_LDFLAGS="$withval" + fi; +- echo "$as_me:3639: result: $BUILD_LDFLAGS" >&5 ++ echo "$as_me:3615: result: $BUILD_LDFLAGS" >&5 + echo "${ECHO_T}$BUILD_LDFLAGS" >&6 + +- echo "$as_me:3642: checking for native build linker-libraries" >&5 ++ echo "$as_me:3618: checking for native build linker-libraries" >&5 + echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 + + # Check whether --with-build-libs or --without-build-libs was given. +@@ -3647,7 +3623,7 @@ + withval="$with_build_libs" + BUILD_LIBS="$withval" + fi; +- echo "$as_me:3650: result: $BUILD_LIBS" >&5 ++ echo "$as_me:3626: result: $BUILD_LIBS" >&5 + echo "${ECHO_T}$BUILD_LIBS" >&6 + + # this assumes we're on Unix. +@@ -3657,7 +3633,7 @@ + : ${BUILD_CC:='${CC}'} + + if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then +- { { echo "$as_me:3660: error: Cross-build requires two compilers. ++ { { echo "$as_me:3636: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&5 + echo "$as_me: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&2;} +@@ -3682,7 +3658,7 @@ + ### shared, for example. + cf_list_models="" + +-echo "$as_me:3685: checking if you want to build shared C-objects" >&5 ++echo "$as_me:3661: checking if you want to build shared C-objects" >&5 + echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6 + + # Check whether --with-shared or --without-shared was given. +@@ -3692,27 +3668,27 @@ + else + with_shared=no + fi; +-echo "$as_me:3695: result: $with_shared" >&5 ++echo "$as_me:3671: result: $with_shared" >&5 + echo "${ECHO_T}$with_shared" >&6 + test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" + +-echo "$as_me:3699: checking for specified models" >&5 ++echo "$as_me:3675: checking for specified models" >&5 + echo $ECHO_N "checking for specified models... $ECHO_C" >&6 + test -z "$cf_list_models" && cf_list_models=normal +-echo "$as_me:3702: result: $cf_list_models" >&5 ++echo "$as_me:3678: 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:3707: checking for default model" >&5 ++echo "$as_me:3683: checking for default model" >&5 + echo $ECHO_N "checking for default model... $ECHO_C" >&6 + DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` +-echo "$as_me:3710: result: $DFT_LWR_MODEL" >&5 ++echo "$as_me:3686: 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:3715: checking for specific curses-directory" >&5 ++echo "$as_me:3691: checking for specific curses-directory" >&5 + echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 + + # Check whether --with-curses-dir or --without-curses-dir was given. +@@ -3722,7 +3698,7 @@ + else + cf_cv_curses_dir=no + fi; +-echo "$as_me:3725: result: $cf_cv_curses_dir" >&5 ++echo "$as_me:3701: result: $cf_cv_curses_dir" >&5 + echo "${ECHO_T}$cf_cv_curses_dir" >&6 + + if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) +@@ -3741,7 +3717,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval withval="$withval" + case ".$withval" in #(vi + .NONE/*) +@@ -3753,7 +3729,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:3756: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:3732: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -3786,7 +3762,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 3789 "configure" ++#line 3765 "configure" + #include "confdefs.h" + #include + int +@@ -3798,16 +3774,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3801: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3777: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3804: \$? = $ac_status" >&5 ++ echo "$as_me:3780: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3807: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3783: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3810: \$? = $ac_status" >&5 ++ echo "$as_me:3786: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -3824,7 +3800,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:3827: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:3803: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -3858,7 +3834,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:3861: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:3837: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -3869,7 +3845,7 @@ + fi + fi + +-echo "$as_me:3872: checking if you want wide-character code" >&5 ++echo "$as_me:3848: checking if you want wide-character code" >&5 + echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 + + # Check whether --enable-widec or --disable-widec was given. +@@ -3879,11 +3855,11 @@ + else + with_widec=no + fi; +-echo "$as_me:3882: result: $with_widec" >&5 ++echo "$as_me:3858: result: $with_widec" >&5 + echo "${ECHO_T}$with_widec" >&6 + if test "$with_widec" = yes ; then + +-echo "$as_me:3886: checking for multibyte character support" >&5 ++echo "$as_me:3862: checking for multibyte character support" >&5 + echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 + if test "${cf_cv_utf8_lib+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3891,7 +3867,7 @@ + + cf_save_LIBS="$LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 3894 "configure" ++#line 3870 "configure" + #include "confdefs.h" + + #include +@@ -3904,16 +3880,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:3907: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:3883: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:3910: \$? = $ac_status" >&5 ++ echo "$as_me:3886: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:3913: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3889: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3916: \$? = $ac_status" >&5 ++ echo "$as_me:3892: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_utf8_lib=yes + else +@@ -3925,12 +3901,12 @@ + cf_cv_header_path_utf8= + cf_cv_library_path_utf8= + +-echo "${as_me:-configure}:3928: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:3904: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 3933 "configure" ++#line 3909 "configure" + #include "confdefs.h" + + #include +@@ -3943,16 +3919,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:3946: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:3922: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:3949: \$? = $ac_status" >&5 ++ echo "$as_me:3925: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:3952: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3928: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3955: \$? = $ac_status" >&5 ++ echo "$as_me:3931: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -3966,7 +3942,7 @@ + LIBS="-lutf8 $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 3969 "configure" ++#line 3945 "configure" + #include "confdefs.h" + + #include +@@ -3979,16 +3955,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:3982: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:3958: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:3985: \$? = $ac_status" >&5 ++ echo "$as_me:3961: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:3988: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3964: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3991: \$? = $ac_status" >&5 ++ echo "$as_me:3967: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -4005,9 +3981,9 @@ + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +-echo "${as_me:-configure}:4008: testing find linkage for utf8 library ..." 1>&5 ++echo "${as_me:-configure}:3984: testing find linkage for utf8 library ..." 1>&5 + +-echo "${as_me:-configure}:4010: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:3986: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -4120,11 +4096,11 @@ + if test -d $cf_cv_header_path_utf8 ; then + test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:4123: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:4099: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" + cat >conftest.$ac_ext <<_ACEOF +-#line 4127 "configure" ++#line 4103 "configure" + #include "confdefs.h" + + #include +@@ -4137,21 +4113,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4140: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4116: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4143: \$? = $ac_status" >&5 ++ echo "$as_me:4119: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4146: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4122: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4149: \$? = $ac_status" >&5 ++ echo "$as_me:4125: \$? = $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}:4154: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:4130: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -4169,7 +4145,7 @@ + + if test "$cf_cv_find_linkage_utf8" = maybe ; then + +-echo "${as_me:-configure}:4172: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:4148: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -4266,13 +4242,13 @@ + if test -d $cf_cv_library_path_utf8 ; then + test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:4269: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:4245: 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 4275 "configure" ++#line 4251 "configure" + #include "confdefs.h" + + #include +@@ -4285,21 +4261,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:4288: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4264: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4291: \$? = $ac_status" >&5 ++ echo "$as_me:4267: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:4294: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4270: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4297: \$? = $ac_status" >&5 ++ echo "$as_me:4273: \$? = $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}:4302: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:4278: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" +@@ -4341,7 +4317,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:4344: result: $cf_cv_utf8_lib" >&5 ++echo "$as_me:4320: result: $cf_cv_utf8_lib" >&5 + echo "${ECHO_T}$cf_cv_utf8_lib" >&6 + + # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between +@@ -4375,7 +4351,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 4378 "configure" ++#line 4354 "configure" + #include "confdefs.h" + #include + int +@@ -4387,16 +4363,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4390: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4366: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4393: \$? = $ac_status" >&5 ++ echo "$as_me:4369: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4396: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4372: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4399: \$? = $ac_status" >&5 ++ echo "$as_me:4375: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -4413,7 +4389,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:4416: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:4392: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -4447,7 +4423,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:4450: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:4426: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -4461,48 +4437,87 @@ + cf_ncuconfig_root=ncursesw + + echo "Looking for ${cf_ncuconfig_root}-config" +-for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config ++ ++if test -n "$ac_tool_prefix"; then ++ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config ++ 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:4446: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$NCURSES_CONFIG"; then ++ ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # 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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" ++echo "$as_me:4461: found $ac_dir/$ac_word" >&5 ++break ++done ++ ++fi ++fi ++NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG ++if test -n "$NCURSES_CONFIG"; then ++ echo "$as_me:4469: result: $NCURSES_CONFIG" >&5 ++echo "${ECHO_T}$NCURSES_CONFIG" >&6 ++else ++ echo "$as_me:4472: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ test -n "$NCURSES_CONFIG" && break ++ done ++fi ++if test -z "$NCURSES_CONFIG"; then ++ ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG ++ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:4468: checking for $ac_word" >&5 ++echo "$as_me:4485: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then ++if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- case $NCURSES_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path. +- ;; +- *) ++ if test -n "$ac_ct_NCURSES_CONFIG"; then ++ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # 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=. +- if $as_executable_p "$ac_dir/$ac_word"; then +- ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:4485: found $ac_dir/$ac_word" >&5 +- break +-fi ++ $as_executable_p "$ac_dir/$ac_word" || continue ++ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" ++echo "$as_me:4500: found $ac_dir/$ac_word" >&5 ++break + done + +- ;; +-esac + fi +-NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG +- +-if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:4496: result: $NCURSES_CONFIG" >&5 +-echo "${ECHO_T}$NCURSES_CONFIG" >&6 ++fi ++ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG ++if test -n "$ac_ct_NCURSES_CONFIG"; then ++ echo "$as_me:4508: result: $ac_ct_NCURSES_CONFIG" >&5 ++echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:4499: result: no" >&5 ++ echo "$as_me:4511: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +- test -n "$NCURSES_CONFIG" && break ++ test -n "$ac_ct_NCURSES_CONFIG" && break + done +-test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" ++test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" ++ ++ NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG ++fi + + if test "$NCURSES_CONFIG" != none ; then + +@@ -4511,7 +4526,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:4514: checking if we have identified curses headers" >&5 ++echo "$as_me:4529: checking if we have identified curses headers" >&5 + echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 + if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4519,13 +4534,13 @@ + + cf_cv_ncurses_header=none + for cf_header in \ +- ncursesw/curses.h \ +- ncursesw/ncurses.h \ +- curses.h \ +- ncurses.h ++ ncursesw/ncurses.h \ ++ ncursesw/curses.h \ ++ ncurses.h \ ++ curses.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 4528 "configure" ++#line 4543 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -4537,16 +4552,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4540: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4555: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4543: \$? = $ac_status" >&5 ++ echo "$as_me:4558: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4546: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4561: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4549: \$? = $ac_status" >&5 ++ echo "$as_me:4564: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -4557,11 +4572,11 @@ + done + + fi +-echo "$as_me:4560: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:4575: result: $cf_cv_ncurses_header" >&5 + echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + + if test "$cf_cv_ncurses_header" = none ; then +- { { echo "$as_me:4564: error: No curses header-files found" >&5 ++ { { echo "$as_me:4579: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -4571,23 +4586,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:4574: checking for $ac_header" >&5 ++echo "$as_me:4589: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 4580 "configure" ++#line 4595 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:4584: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:4599: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:4590: \$? = $ac_status" >&5 ++ echo "$as_me:4605: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -4606,7 +4621,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:4609: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:4624: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <conftest.$ac_ext <<_ACEOF +-#line 4662 "configure" ++#line 4677 "configure" + #include "confdefs.h" + #include + int +@@ -4671,16 +4686,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4674: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4689: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4677: \$? = $ac_status" >&5 ++ echo "$as_me:4692: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4680: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4695: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4683: \$? = $ac_status" >&5 ++ echo "$as_me:4698: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -4697,7 +4712,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:4700: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:4715: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -4714,7 +4729,7 @@ + + } + +-echo "$as_me:4717: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:4732: checking for $cf_ncuhdr_root header in include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4726,7 +4741,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 4729 "configure" ++#line 4744 "configure" + #include "confdefs.h" + + #define _XOPEN_SOURCE_EXTENDED +@@ -4758,16 +4773,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4761: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4776: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4764: \$? = $ac_status" >&5 ++ echo "$as_me:4779: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4767: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4782: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4770: \$? = $ac_status" >&5 ++ echo "$as_me:4785: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -4782,14 +4797,14 @@ + done + + fi +-echo "$as_me:4785: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:4800: 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:4792: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:4807: checking for $cf_ncuhdr_root include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4929,7 +4944,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 4932 "configure" ++#line 4947 "configure" + #include "confdefs.h" + #include + int +@@ -4941,16 +4956,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4944: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4959: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4947: \$? = $ac_status" >&5 ++ echo "$as_me:4962: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4950: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4965: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4953: \$? = $ac_status" >&5 ++ echo "$as_me:4968: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -4967,7 +4982,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:4970: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:4985: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -4988,7 +5003,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 4991 "configure" ++#line 5006 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -5012,16 +5027,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5015: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5030: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5018: \$? = $ac_status" >&5 ++ echo "$as_me:5033: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5021: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5036: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5024: \$? = $ac_status" >&5 ++ echo "$as_me:5039: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -5042,12 +5057,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5045: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5060: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:5050: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:5065: result: $cf_cv_ncurses_h2" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + + cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` +@@ -5080,7 +5095,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 5083 "configure" ++#line 5098 "configure" + #include "confdefs.h" + #include + int +@@ -5092,16 +5107,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5095: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5110: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5098: \$? = $ac_status" >&5 ++ echo "$as_me:5113: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5101: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5116: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5104: \$? = $ac_status" >&5 ++ echo "$as_me:5119: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -5118,7 +5133,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:5121: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:5136: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -5161,7 +5176,7 @@ + ;; + esac + +-echo "$as_me:5164: checking for terminfo header" >&5 ++echo "$as_me:5179: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5179,7 +5194,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 5182 "configure" ++#line 5197 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -5194,16 +5209,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5197: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5212: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5200: \$? = $ac_status" >&5 ++ echo "$as_me:5215: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5203: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5218: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5206: \$? = $ac_status" >&5 ++ echo "$as_me:5221: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -5219,7 +5234,7 @@ + done + + fi +-echo "$as_me:5222: result: $cf_cv_term_header" >&5 ++echo "$as_me:5237: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -5253,7 +5268,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:5256: checking for ncurses version" >&5 ++echo "$as_me:5271: checking for ncurses version" >&5 + echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 + if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5279,10 +5294,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:5282: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:5297: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:5285: \$? = $ac_status" >&5 ++ echo "$as_me:5300: \$? = $ac_status" >&5 + (exit $ac_status); } + if test -f conftest.out ; then + cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` +@@ -5292,7 +5307,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 5295 "configure" ++#line 5310 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -5317,15 +5332,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:5320: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5335: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5323: \$? = $ac_status" >&5 ++ echo "$as_me:5338: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:5325: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5340: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5328: \$? = $ac_status" >&5 ++ echo "$as_me:5343: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -5339,7 +5354,7 @@ + rm -f $cf_tempfile + + fi +-echo "$as_me:5342: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:5357: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF + #define NCURSES 1 +@@ -5351,7 +5366,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:5354: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:5369: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5359,7 +5374,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5362 "configure" ++#line 5377 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5378,16 +5393,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5381: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5396: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5384: \$? = $ac_status" >&5 ++ echo "$as_me:5399: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5387: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5402: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5390: \$? = $ac_status" >&5 ++ echo "$as_me:5405: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -5398,10 +5413,10 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:5401: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:5416: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test $ac_cv_lib_gpm_Gpm_Open = yes; then +- echo "$as_me:5404: checking for initscr in -lgpm" >&5 ++ echo "$as_me:5419: checking for initscr in -lgpm" >&5 + echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5409,7 +5424,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5412 "configure" ++#line 5427 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5428,16 +5443,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5431: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5446: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5434: \$? = $ac_status" >&5 ++ echo "$as_me:5449: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5437: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5452: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5440: \$? = $ac_status" >&5 ++ echo "$as_me:5455: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -5448,7 +5463,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:5451: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:5466: result: $ac_cv_lib_gpm_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 + if test $ac_cv_lib_gpm_initscr = yes; then + LIBS="$cf_ncurses_SAVE" +@@ -5463,7 +5478,7 @@ + # This is only necessary if you are linking against an obsolete + # version of ncurses (but it should do no harm, since it's static). + if test "$cf_nculib_root" = ncurses ; then +- echo "$as_me:5466: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:5481: checking for tgoto in -lmytinfo" >&5 + echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 + if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5471,7 +5486,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5474 "configure" ++#line 5489 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5490,16 +5505,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5493: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5508: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5496: \$? = $ac_status" >&5 ++ echo "$as_me:5511: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5499: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5514: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5502: \$? = $ac_status" >&5 ++ echo "$as_me:5517: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -5510,7 +5525,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:5513: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:5528: result: $ac_cv_lib_mytinfo_tgoto" >&5 + echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 + if test $ac_cv_lib_mytinfo_tgoto = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +@@ -5529,13 +5544,13 @@ + + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + cf_libdir="" +- echo "$as_me:5532: checking for initscr" >&5 ++ echo "$as_me:5547: checking for initscr" >&5 + echo $ECHO_N "checking for initscr... $ECHO_C" >&6 + if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 5538 "configure" ++#line 5553 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char initscr (); below. */ +@@ -5558,7 +5573,7 @@ + #if defined (__stub_initscr) || defined (__stub___initscr) + choke me + #else +-f = initscr; ++f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -5566,16 +5581,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5569: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5584: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5572: \$? = $ac_status" >&5 ++ echo "$as_me:5587: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5575: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5590: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5578: \$? = $ac_status" >&5 ++ echo "$as_me:5593: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_initscr=yes + else +@@ -5585,18 +5600,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:5588: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:5603: 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:5595: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:5610: checking for initscr in -l$cf_nculib_root" >&5 + echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5599 "configure" ++#line 5614 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -5608,25 +5623,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5611: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5626: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5614: \$? = $ac_status" >&5 ++ echo "$as_me:5629: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5617: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5632: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5620: \$? = $ac_status" >&5 ++ echo "$as_me:5635: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:5622: result: yes" >&5 ++ echo "$as_me:5637: 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:5629: result: no" >&5 ++echo "$as_me:5644: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -5716,11 +5731,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:5719: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:5734: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5723 "configure" ++#line 5738 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -5732,25 +5747,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5735: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5750: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5738: \$? = $ac_status" >&5 ++ echo "$as_me:5753: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5741: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5756: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5744: \$? = $ac_status" >&5 ++ echo "$as_me:5759: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:5746: result: yes" >&5 ++ echo "$as_me:5761: 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:5753: result: no" >&5 ++echo "$as_me:5768: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -5765,7 +5780,7 @@ + eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root + + if test $cf_found_library = no ; then +- { { echo "$as_me:5768: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:5783: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5773,7 +5788,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:5776: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:5791: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do +@@ -5783,7 +5798,7 @@ + fi + done + cat >conftest.$ac_ext <<_ACEOF +-#line 5786 "configure" ++#line 5801 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -5795,23 +5810,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5798: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5813: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5801: \$? = $ac_status" >&5 ++ echo "$as_me:5816: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5804: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5819: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5807: \$? = $ac_status" >&5 ++ echo "$as_me:5822: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:5809: result: yes" >&5 ++ echo "$as_me:5824: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:5814: result: no" >&5 ++echo "$as_me:5829: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -5831,48 +5846,87 @@ + cf_ncuconfig_root=ncurses + + echo "Looking for ${cf_ncuconfig_root}-config" +-for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config ++ ++if test -n "$ac_tool_prefix"; then ++ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config ++ 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:5855: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$NCURSES_CONFIG"; then ++ ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # 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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" ++echo "$as_me:5870: found $ac_dir/$ac_word" >&5 ++break ++done ++ ++fi ++fi ++NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG ++if test -n "$NCURSES_CONFIG"; then ++ echo "$as_me:5878: result: $NCURSES_CONFIG" >&5 ++echo "${ECHO_T}$NCURSES_CONFIG" >&6 ++else ++ echo "$as_me:5881: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ test -n "$NCURSES_CONFIG" && break ++ done ++fi ++if test -z "$NCURSES_CONFIG"; then ++ ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG ++ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:5838: checking for $ac_word" >&5 ++echo "$as_me:5894: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then ++if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- case $NCURSES_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path. +- ;; +- *) ++ if test -n "$ac_ct_NCURSES_CONFIG"; then ++ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # 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=. +- if $as_executable_p "$ac_dir/$ac_word"; then +- ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:5855: found $ac_dir/$ac_word" >&5 +- break +-fi ++ $as_executable_p "$ac_dir/$ac_word" || continue ++ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" ++echo "$as_me:5909: found $ac_dir/$ac_word" >&5 ++break + done + +- ;; +-esac + fi +-NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG +- +-if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:5866: result: $NCURSES_CONFIG" >&5 +-echo "${ECHO_T}$NCURSES_CONFIG" >&6 ++fi ++ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG ++if test -n "$ac_ct_NCURSES_CONFIG"; then ++ echo "$as_me:5917: result: $ac_ct_NCURSES_CONFIG" >&5 ++echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:5869: result: no" >&5 ++ echo "$as_me:5920: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +- test -n "$NCURSES_CONFIG" && break ++ test -n "$ac_ct_NCURSES_CONFIG" && break + done +-test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" ++test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" ++ ++ NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG ++fi + + if test "$NCURSES_CONFIG" != none ; then + +@@ -5881,7 +5935,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:5884: checking if we have identified curses headers" >&5 ++echo "$as_me:5938: checking if we have identified curses headers" >&5 + echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 + if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5889,13 +5943,13 @@ + + cf_cv_ncurses_header=none + for cf_header in \ +- ncurses/curses.h \ +- ncurses/ncurses.h \ +- curses.h \ +- ncurses.h ++ ncurses/ncurses.h \ ++ ncurses/curses.h \ ++ ncurses.h \ ++ curses.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 5898 "configure" ++#line 5952 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -5907,16 +5961,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5910: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5964: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5913: \$? = $ac_status" >&5 ++ echo "$as_me:5967: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5916: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5970: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5919: \$? = $ac_status" >&5 ++ echo "$as_me:5973: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -5927,11 +5981,11 @@ + done + + fi +-echo "$as_me:5930: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:5984: result: $cf_cv_ncurses_header" >&5 + echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + + if test "$cf_cv_ncurses_header" = none ; then +- { { echo "$as_me:5934: error: No curses header-files found" >&5 ++ { { echo "$as_me:5988: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5941,23 +5995,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:5944: checking for $ac_header" >&5 ++echo "$as_me:5998: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 5950 "configure" ++#line 6004 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:5954: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:6008: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:5960: \$? = $ac_status" >&5 ++ echo "$as_me:6014: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -5976,7 +6030,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:5979: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:6033: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <conftest.$ac_ext <<_ACEOF +-#line 6032 "configure" ++#line 6086 "configure" + #include "confdefs.h" + #include + int +@@ -6041,16 +6095,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6044: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6098: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6047: \$? = $ac_status" >&5 ++ echo "$as_me:6101: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6050: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6104: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6053: \$? = $ac_status" >&5 ++ echo "$as_me:6107: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -6067,7 +6121,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:6070: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:6124: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -6084,7 +6138,7 @@ + + } + +-echo "$as_me:6087: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:6141: checking for $cf_ncuhdr_root header in include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6096,7 +6150,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 6099 "configure" ++#line 6153 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -6120,16 +6174,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6123: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6177: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6126: \$? = $ac_status" >&5 ++ echo "$as_me:6180: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6129: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6183: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6132: \$? = $ac_status" >&5 ++ echo "$as_me:6186: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -6144,14 +6198,14 @@ + done + + fi +-echo "$as_me:6147: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:6201: 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:6154: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:6208: checking for $cf_ncuhdr_root include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6291,7 +6345,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 6294 "configure" ++#line 6348 "configure" + #include "confdefs.h" + #include + int +@@ -6303,16 +6357,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6306: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6360: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6309: \$? = $ac_status" >&5 ++ echo "$as_me:6363: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6312: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6366: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6315: \$? = $ac_status" >&5 ++ echo "$as_me:6369: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -6329,7 +6383,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:6332: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:6386: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -6350,7 +6404,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 6353 "configure" ++#line 6407 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -6374,16 +6428,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6377: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6431: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6380: \$? = $ac_status" >&5 ++ echo "$as_me:6434: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6383: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6437: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6386: \$? = $ac_status" >&5 ++ echo "$as_me:6440: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -6404,12 +6458,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6407: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6461: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:6412: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:6466: result: $cf_cv_ncurses_h2" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + + cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` +@@ -6442,7 +6496,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 6445 "configure" ++#line 6499 "configure" + #include "confdefs.h" + #include + int +@@ -6454,16 +6508,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6457: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6511: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6460: \$? = $ac_status" >&5 ++ echo "$as_me:6514: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6463: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6517: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6466: \$? = $ac_status" >&5 ++ echo "$as_me:6520: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -6480,7 +6534,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:6483: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:6537: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -6523,7 +6577,7 @@ + ;; + esac + +-echo "$as_me:6526: checking for terminfo header" >&5 ++echo "$as_me:6580: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6541,7 +6595,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 6544 "configure" ++#line 6598 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -6556,16 +6610,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6559: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6613: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6562: \$? = $ac_status" >&5 ++ echo "$as_me:6616: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6565: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6619: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6568: \$? = $ac_status" >&5 ++ echo "$as_me:6622: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -6581,7 +6635,7 @@ + done + + fi +-echo "$as_me:6584: result: $cf_cv_term_header" >&5 ++echo "$as_me:6638: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -6615,7 +6669,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:6618: checking for ncurses version" >&5 ++echo "$as_me:6672: checking for ncurses version" >&5 + echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 + if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6641,10 +6695,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:6644: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:6698: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:6647: \$? = $ac_status" >&5 ++ echo "$as_me:6701: \$? = $ac_status" >&5 + (exit $ac_status); } + if test -f conftest.out ; then + cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` +@@ -6654,7 +6708,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 6657 "configure" ++#line 6711 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -6679,15 +6733,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:6682: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6736: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6685: \$? = $ac_status" >&5 ++ echo "$as_me:6739: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:6687: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6741: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6690: \$? = $ac_status" >&5 ++ echo "$as_me:6744: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -6701,7 +6755,7 @@ + rm -f $cf_tempfile + + fi +-echo "$as_me:6704: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:6758: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF + #define NCURSES 1 +@@ -6713,7 +6767,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:6716: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:6770: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6721,7 +6775,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6724 "configure" ++#line 6778 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6740,16 +6794,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6743: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6797: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6746: \$? = $ac_status" >&5 ++ echo "$as_me:6800: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6749: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6803: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6752: \$? = $ac_status" >&5 ++ echo "$as_me:6806: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -6760,10 +6814,10 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6763: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:6817: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test $ac_cv_lib_gpm_Gpm_Open = yes; then +- echo "$as_me:6766: checking for initscr in -lgpm" >&5 ++ echo "$as_me:6820: checking for initscr in -lgpm" >&5 + echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6771,7 +6825,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6774 "configure" ++#line 6828 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6790,16 +6844,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6793: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6847: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6796: \$? = $ac_status" >&5 ++ echo "$as_me:6850: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6799: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6853: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6802: \$? = $ac_status" >&5 ++ echo "$as_me:6856: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -6810,7 +6864,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6813: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:6867: result: $ac_cv_lib_gpm_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 + if test $ac_cv_lib_gpm_initscr = yes; then + LIBS="$cf_ncurses_SAVE" +@@ -6825,7 +6879,7 @@ + # This is only necessary if you are linking against an obsolete + # version of ncurses (but it should do no harm, since it's static). + if test "$cf_nculib_root" = ncurses ; then +- echo "$as_me:6828: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:6882: checking for tgoto in -lmytinfo" >&5 + echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 + if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6833,7 +6887,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6836 "configure" ++#line 6890 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6852,16 +6906,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6855: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6909: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6858: \$? = $ac_status" >&5 ++ echo "$as_me:6912: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6861: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6915: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6864: \$? = $ac_status" >&5 ++ echo "$as_me:6918: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -6872,7 +6926,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6875: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:6929: result: $ac_cv_lib_mytinfo_tgoto" >&5 + echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 + if test $ac_cv_lib_mytinfo_tgoto = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +@@ -6891,13 +6945,13 @@ + + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + cf_libdir="" +- echo "$as_me:6894: checking for initscr" >&5 ++ echo "$as_me:6948: checking for initscr" >&5 + echo $ECHO_N "checking for initscr... $ECHO_C" >&6 + if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 6900 "configure" ++#line 6954 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char initscr (); below. */ +@@ -6920,7 +6974,7 @@ + #if defined (__stub_initscr) || defined (__stub___initscr) + choke me + #else +-f = initscr; ++f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -6928,16 +6982,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6931: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6985: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6934: \$? = $ac_status" >&5 ++ echo "$as_me:6988: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6937: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6991: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6940: \$? = $ac_status" >&5 ++ echo "$as_me:6994: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_initscr=yes + else +@@ -6947,18 +7001,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:6950: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:7004: 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:6957: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:7011: checking for initscr in -l$cf_nculib_root" >&5 + echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6961 "configure" ++#line 7015 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6970,25 +7024,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6973: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7027: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6976: \$? = $ac_status" >&5 ++ echo "$as_me:7030: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6979: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7033: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6982: \$? = $ac_status" >&5 ++ echo "$as_me:7036: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:6984: result: yes" >&5 ++ echo "$as_me:7038: 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:6991: result: no" >&5 ++echo "$as_me:7045: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -7078,11 +7132,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:7081: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:7135: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7085 "configure" ++#line 7139 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -7094,25 +7148,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7097: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7151: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7100: \$? = $ac_status" >&5 ++ echo "$as_me:7154: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7103: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7157: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7106: \$? = $ac_status" >&5 ++ echo "$as_me:7160: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:7108: result: yes" >&5 ++ echo "$as_me:7162: 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:7115: result: no" >&5 ++echo "$as_me:7169: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -7127,7 +7181,7 @@ + eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root + + if test $cf_found_library = no ; then +- { { echo "$as_me:7130: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:7184: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7135,7 +7189,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:7138: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:7192: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do +@@ -7145,7 +7199,7 @@ + fi + done + cat >conftest.$ac_ext <<_ACEOF +-#line 7148 "configure" ++#line 7202 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -7157,23 +7211,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7160: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7214: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7163: \$? = $ac_status" >&5 ++ echo "$as_me:7217: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7166: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7220: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7169: \$? = $ac_status" >&5 ++ echo "$as_me:7223: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:7171: result: yes" >&5 ++ echo "$as_me:7225: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:7176: result: no" >&5 ++echo "$as_me:7230: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -7210,10 +7264,10 @@ + AUTOCONF_$cf_name NCURSES_VERSION_$cf_name + CF_EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out" +- { (eval echo "$as_me:7213: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:7267: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:7216: \$? = $ac_status" >&5 ++ echo "$as_me:7270: \$? = $ac_status" >&5 + (exit $ac_status); } + if test -f conftest.out ; then + cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[ ][ ]*//"` +@@ -7231,9 +7285,25 @@ + + cf_cv_timestamp=`date` + +-echo "$as_me:7234: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 ++echo "$as_me:7288: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 + echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 + ++echo "$as_me:7291: checking if you want to have a library-prefix" >&5 ++echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 ++ ++# Check whether --with-lib-prefix or --without-lib-prefix was given. ++if test "${with_lib_prefix+set}" = set; then ++ withval="$with_lib_prefix" ++ with_lib_prefix=$withval ++else ++ with_lib_prefix=auto ++fi; ++echo "$as_me:7301: result: $with_lib_prefix" >&5 ++echo "${ECHO_T}$with_lib_prefix" >&6 ++ ++if test $with_lib_prefix = auto ++then ++ + case $cf_cv_system_name in #(vi + OS/2*|os2*) #(vi + LIB_PREFIX='' +@@ -7243,7 +7313,12 @@ + esac + cf_prefix=$LIB_PREFIX + +-LIB_PREFIX=$cf_prefix ++elif test $with_lib_prefix = no ++then ++ LIB_PREFIX= ++else ++ LIB_PREFIX=$with_lib_prefix ++fi + + LIB_SUFFIX= + +@@ -7254,7 +7329,7 @@ + test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT='' + fi + +-echo "$as_me:7257: checking for default loader flags" >&5 ++echo "$as_me:7332: checking for default loader flags" >&5 + echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 + case $DFT_LWR_MODEL in + normal) LD_MODEL='' ;; +@@ -7262,11 +7337,11 @@ + profile) LD_MODEL='-pg';; + shared) LD_MODEL='' ;; + esac +-echo "$as_me:7265: result: $LD_MODEL" >&5 ++echo "$as_me:7340: result: $LD_MODEL" >&5 + echo "${ECHO_T}$LD_MODEL" >&6 + + LD_RPATH_OPT= +-echo "$as_me:7269: checking for an rpath option" >&5 ++echo "$as_me:7344: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case $cf_cv_system_name in #(vi + irix*) #(vi +@@ -7279,10 +7354,10 @@ + linux*|gnu*|k*bsd*-gnu) #(vi + LD_RPATH_OPT="-Wl,-rpath," + ;; +-openbsd[2-9].*) #(vi ++openbsd[2-9].*|mirbsd*) #(vi + LD_RPATH_OPT="-Wl,-rpath," + ;; +-freebsd*) #(vi ++dragonfly*|freebsd*) #(vi + LD_RPATH_OPT="-rpath " + ;; + netbsd*) #(vi +@@ -7297,17 +7372,17 @@ + *) + ;; + esac +-echo "$as_me:7300: result: $LD_RPATH_OPT" >&5 ++echo "$as_me:7375: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in #(vi + x-R*) +- echo "$as_me:7305: checking if we need a space after rpath option" >&5 ++ echo "$as_me:7380: checking if we need a space after rpath option" >&5 + echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + LIBS="${LD_RPATH_OPT}$libdir $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7310 "configure" ++#line 7385 "configure" + #include "confdefs.h" + + int +@@ -7319,16 +7394,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7322: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7397: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7325: \$? = $ac_status" >&5 ++ echo "$as_me:7400: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7328: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7403: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7331: \$? = $ac_status" >&5 ++ echo "$as_me:7406: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_rpath_space=no + else +@@ -7338,7 +7413,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save_LIBS" +- echo "$as_me:7341: result: $cf_rpath_space" >&5 ++ echo "$as_me:7416: result: $cf_rpath_space" >&5 + echo "${ECHO_T}$cf_rpath_space" >&6 + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; +@@ -7353,7 +7428,7 @@ + cf_ld_rpath_opt= + test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" + +- echo "$as_me:7356: checking if release/abi version should be used for shared libs" >&5 ++ echo "$as_me:7431: checking if release/abi version should be used for shared libs" >&5 + echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 + + # Check whether --with-shlib-version or --without-shlib-version was given. +@@ -7368,7 +7443,7 @@ + cf_cv_shlib_version=$withval + ;; + *) +- { { echo "$as_me:7371: error: option value must be one of: rel, abi, auto or no" >&5 ++ { { echo "$as_me:7446: error: option value must be one of: rel, abi, auto or no" >&5 + echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -7377,7 +7452,7 @@ + else + cf_cv_shlib_version=auto + fi; +- echo "$as_me:7380: result: $cf_cv_shlib_version" >&5 ++ echo "$as_me:7455: result: $cf_cv_shlib_version" >&5 + echo "${ECHO_T}$cf_cv_shlib_version" >&6 + + cf_cv_rm_so_locs=no +@@ -7386,14 +7461,14 @@ + CC_SHARED_OPTS= + if test "$GCC" = yes + then +- echo "$as_me:7389: checking which $CC option to use" >&5 ++ echo "$as_me:7464: 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 7396 "configure" ++#line 7471 "configure" + #include "confdefs.h" + #include + int +@@ -7405,16 +7480,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7408: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7483: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7411: \$? = $ac_status" >&5 ++ echo "$as_me:7486: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7414: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7489: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7417: \$? = $ac_status" >&5 ++ echo "$as_me:7492: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -7423,7 +7498,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + done +- echo "$as_me:7426: result: $CC_SHARED_OPTS" >&5 ++ echo "$as_me:7501: result: $CC_SHARED_OPTS" >&5 + echo "${ECHO_T}$CC_SHARED_OPTS" >&6 + CFLAGS="$cf_save_CFLAGS" + fi +@@ -7431,10 +7506,14 @@ + cf_cv_shlib_version_infix=no + + case $cf_cv_system_name in #(vi +- aix[56]*) #(vi ++ aix4.3-9*|aix[5-7]*) #(vi + if test "$GCC" = yes; then + CC_SHARED_OPTS= +- MK_SHARED_LIB='$(CC) -shared' ++ MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@' ++ else ++ # CC_SHARED_OPTS='-qpic=large -G' ++ # perhaps "-bM:SRE -bnoentry -bexpall" ++ MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@' + fi + ;; + beos*) #(vi +@@ -7465,7 +7544,7 @@ + MK_SHARED_LIB='${CC} ${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:7468: checking if ld -search_paths_first works" >&5 ++ echo "$as_me:7547: 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 +@@ -7474,7 +7553,7 @@ + cf_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + cat >conftest.$ac_ext <<_ACEOF +-#line 7477 "configure" ++#line 7556 "configure" + #include "confdefs.h" + + int +@@ -7486,16 +7565,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7489: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7568: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7492: \$? = $ac_status" >&5 ++ echo "$as_me:7571: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7495: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7574: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7498: \$? = $ac_status" >&5 ++ echo "$as_me:7577: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ldflags_search_paths_first=yes + else +@@ -7506,7 +7585,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$cf_save_LDFLAGS + fi +-echo "$as_me:7509: result: $cf_cv_ldflags_search_paths_first" >&5 ++echo "$as_me:7588: 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" +@@ -7525,9 +7604,19 @@ + # readonly to exploit a quirk in the memory manager. + INSTALL_LIB="-m 555" + ;; ++ interix*) ++ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel ++ if test "$cf_cv_shlib_version" = rel; then ++ cf_shared_soname='`basename .${REL_VERSION}`.${ABI_VERSION}' ++ else ++ cf_shared_soname='`basename `' ++ fi ++ CC_SHARED_OPTS= ++ MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o ' ++ ;; + irix*) #(vi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + # tested with IRIX 5.2 and 'cc'. + if test "$GCC" != yes; then +@@ -7544,7 +7633,7 @@ + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel +@@ -7556,13 +7645,34 @@ + + MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' + ;; +- openbsd[2-9].*) #(vi ++ mingw*) #(vi ++ cf_cv_shlib_version=mingw ++ cf_cv_shlib_version_infix=mingw ++ CC_SHARED_OPTS= ++ MK_SHARED_LIB='sh ../mk_shared_lib.sh $@ ${CC} ${CFLAGS}' ++ #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]' ++ #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]' ++ cat >mk_shared_lib.sh <<-CF_EOF ++ #!/bin/sh ++ SHARED_LIB=\$1 ++ IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$/.dll.a/'\` ++ shift ++ cat <<-EOF ++ Linking shared library ++ ** SHARED_LIB \$SHARED_LIB ++ ** IMPORT_LIB \$IMPORT_LIB ++EOF ++ exec \$* -shared -Wl,--out-implib=../lib/\${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\${SHARED_LIB} ++CF_EOF ++ chmod +x mk_shared_lib.sh ++ ;; ++ openbsd[2-9].*|mirbsd*) #(vi + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + +@@ -7580,12 +7690,12 @@ + MK_SHARED_LIB='${LD} -Bshareable -o $@' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + ;; +- freebsd*) #(vi ++ dragonfly*|freebsd*) #(vi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" +- LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${libdir} $LOCAL_LDFLAGS" +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel +@@ -7602,7 +7712,7 @@ + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + if test "$cf_cv_shlib_version" = auto; then + if test -f /usr/libexec/ld.elf_so; then + cf_cv_shlib_version=abi +@@ -7686,7 +7796,7 @@ + do + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7689 "configure" ++#line 7799 "configure" + #include "confdefs.h" + #include + int +@@ -7698,16 +7808,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7701: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7811: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7704: \$? = $ac_status" >&5 ++ echo "$as_me:7814: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7707: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7817: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7710: \$? = $ac_status" >&5 ++ echo "$as_me:7820: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -7744,22 +7854,30 @@ + test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes + ;; + *) +- { echo "$as_me:7747: WARNING: ignored --with-shlib-version" >&5 ++ { echo "$as_me:7857: WARNING: ignored --with-shlib-version" >&5 + echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} + ;; + esac + ;; + esac + +- if test -n "$cf_ld_rpath_opt" ; then +- MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}" +- fi ++ # RPATH_LIST is a colon-separated list of directories ++ test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" ++ test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" ++ ++ test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 ++ ++echo "${as_me:-configure}:7870: 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}:7874: 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:7762: checking if you want to link sample programs with rpath option" >&5 ++ echo "$as_me:7880: 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. +@@ -7769,7 +7887,7 @@ + else + with_rpath_link=yes + fi; +- echo "$as_me:7772: result: $with_rpath_link" >&5 ++ echo "$as_me:7890: result: $with_rpath_link" >&5 + echo "${ECHO_T}$with_rpath_link" >&6 + if test "$with_rpath_link" = no + then +@@ -7780,13 +7898,8 @@ + + ############################################################################### + +- case $cf_cv_system_name in +- os2*) PATH_SEPARATOR=';' ;; +- *) PATH_SEPARATOR=':' ;; +- esac +- + ### use option --enable-broken-linker to force on use of broken-linker support +-echo "$as_me:7789: checking if you want broken-linker support code" >&5 ++echo "$as_me:7902: 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. +@@ -7796,7 +7909,7 @@ + else + with_broken_linker=${BROKEN_LINKER:-no} + fi; +-echo "$as_me:7799: result: $with_broken_linker" >&5 ++echo "$as_me:7912: result: $with_broken_linker" >&5 + echo "${ECHO_T}$with_broken_linker" >&6 + + BROKEN_LINKER=0 +@@ -7816,7 +7929,7 @@ + BROKEN_LINKER=1 + test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 + +-echo "${as_me:-configure}:7819: testing cygwin linker is broken anyway ..." 1>&5 ++echo "${as_me:-configure}:7932: testing cygwin linker is broken anyway ..." 1>&5 + + ;; + esac +@@ -7829,7 +7942,7 @@ + cf_xopen_source= + + case $host_os in #(vi +-aix[456]*) #(vi ++aix[4-7]*) #(vi + cf_xopen_source="-D_ALL_SOURCE" + ;; + cygwin) #(vi +@@ -7840,6 +7953,7 @@ + ;; + darwin*) #(vi + cf_xopen_source="-D_DARWIN_C_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + freebsd*|dragonfly*) #(vi + # 5.x headers associate +@@ -7857,17 +7971,18 @@ + ;; + irix[56].*) #(vi + cf_xopen_source="-D_SGI_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + linux*|gnu*|mint*|k*bsd*-gnu) #(vi + +-echo "$as_me:7863: checking if we must define _GNU_SOURCE" >&5 ++echo "$as_me:7978: 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 7870 "configure" ++#line 7985 "configure" + #include "confdefs.h" + #include + int +@@ -7882,16 +7997,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7885: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8000: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7888: \$? = $ac_status" >&5 ++ echo "$as_me:8003: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7891: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8006: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7894: \$? = $ac_status" >&5 ++ echo "$as_me:8009: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -7900,7 +8015,7 @@ + cf_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + cat >conftest.$ac_ext <<_ACEOF +-#line 7903 "configure" ++#line 8018 "configure" + #include "confdefs.h" + #include + int +@@ -7915,16 +8030,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7918: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8033: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7921: \$? = $ac_status" >&5 ++ echo "$as_me:8036: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7924: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8039: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7927: \$? = $ac_status" >&5 ++ echo "$as_me:8042: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -7939,51 +8054,45 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:7942: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:8057: result: $cf_cv_gnu_source" >&5 + echo "${ECHO_T}$cf_cv_gnu_source" >&6 + test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + + ;; + mirbsd*) #(vi +- # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks +- ;; +-netbsd*) #(vi +- # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw +- ;; +-openbsd*) #(vi +- # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw +- ;; +-osf[45]*) #(vi +- cf_xopen_source="-D_OSF_SOURCE" +- ;; +-nto-qnx*) #(vi +- cf_xopen_source="-D_QNX_SOURCE" +- ;; +-sco*) #(vi +- # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer +- ;; +-solaris2.1[0-9]) #(vi +- cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- ;; +-solaris2.[1-9]) #(vi +- cf_xopen_source="-D__EXTENSIONS__" +- ;; +-*) +- echo "$as_me:7972: 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 ++ # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks and other headers which use u_int / u_short types ++ cf_XOPEN_SOURCE= ++ ++cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE ++ ++cf_save_CFLAGS="$CFLAGS" ++cf_save_CPPFLAGS="$CPPFLAGS" ++ ++cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ ++ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ ++ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++echo "$as_me:8079: 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}:8085: testing if the symbol is already defined go no further ..." 1>&5 ++ + cat >conftest.$ac_ext <<_ACEOF +-#line 7979 "configure" ++#line 8088 "configure" + #include "confdefs.h" + #include + int + main () + { + +-#ifndef _XOPEN_SOURCE ++#ifndef _POSIX_C_SOURCE + make an error + #endif + ; +@@ -7991,32 +8100,44 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7994: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8103: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7997: \$? = $ac_status" >&5 ++ echo "$as_me:8106: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8000: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8109: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8003: \$? = $ac_status" >&5 ++ echo "$as_me:8112: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- cf_cv_xopen_source=no ++ cf_cv_posix_c_source=no + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-cf_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- cat >conftest.$ac_ext <<_ACEOF +-#line 8012 "configure" ++cf_want_posix_source=no ++ case .$cf_POSIX_C_SOURCE in #(vi ++ .[12]??*) #(vi ++ cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" ++ ;; ++ .2) #(vi ++ cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" ++ cf_want_posix_source=yes ++ ;; ++ .*) ++ cf_want_posix_source=yes ++ ;; ++ esac ++ if test "$cf_want_posix_source" = yes ; then ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8133 "configure" + #include "confdefs.h" + #include + int + main () + { + +-#ifdef _XOPEN_SOURCE ++#ifdef _POSIX_SOURCE + make an error + #endif + ; +@@ -8024,33 +8145,278 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8027: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8148: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8030: \$? = $ac_status" >&5 ++ echo "$as_me:8151: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8033: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8154: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8036: \$? = $ac_status" >&5 ++ echo "$as_me:8157: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- cf_cv_xopen_source=no ++ : + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-cf_cv_xopen_source=$cf_XOPEN_SOURCE ++cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- CPPFLAGS="$cf_save" ++ fi ++ ++echo "${as_me:-configure}:8168: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++ ++ CFLAGS="$cf_trim_CFLAGS" ++ CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" ++ ++echo "${as_me:-configure}:8173: testing if the second compile does not leave our definition intact error ..." 1>&5 ++ ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8176 "configure" ++#include "confdefs.h" ++#include ++int ++main () ++{ ++ ++#ifndef _POSIX_C_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:8191: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:8194: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:8197: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8200: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_posix_c_source=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$cf_save_CFLAGS" ++ CPPFLAGS="$cf_save_CPPFLAGS" ++ ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ ++fi ++echo "$as_me:8216: 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 ++ CFLAGS="$cf_trim_CFLAGS" ++ CPPFLAGS="$cf_trim_CPPFLAGS" ++ ++cf_fix_cppflags=no ++cf_new_cflags= ++cf_new_cppflags= ++cf_new_extra_cppflags= ++ ++for cf_add_cflags in $cf_cv_posix_c_source ++do ++case $cf_fix_cppflags in ++no) ++ case $cf_add_cflags in #(vi ++ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi ++ case $cf_add_cflags in ++ -D*) ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=yes ++ ++ if test $cf_fix_cppflags = yes ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ elif test "${cf_tst_cflags}" = "\"'" ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ fi ++ ;; ++ esac ++ case "$CPPFLAGS" in ++ *$cf_add_cflags) #(vi ++ ;; ++ *) #(vi ++ case $cf_add_cflags in #(vi ++ -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 ++ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++ *) ++ cf_new_cflags="$cf_new_cflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++yes) ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=no ++ ;; ++esac ++done ++ ++if test -n "$cf_new_cflags" ; then ++ ++ CFLAGS="$CFLAGS $cf_new_cflags" ++fi ++ ++if test -n "$cf_new_cppflags" ; then ++ ++ CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++fi ++ ++if test -n "$cf_new_extra_cppflags" ; then ++ ++ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" ++fi ++ ++fi ++ ++ ;; ++netbsd*) #(vi ++ cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ++ ;; ++openbsd[4-9]*) #(vi ++ # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw ++ cf_xopen_source="-D_BSD_SOURCE" ++ cf_XOPEN_SOURCE=600 ++ ;; ++openbsd*) #(vi ++ # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw ++ ;; ++osf[45]*) #(vi ++ cf_xopen_source="-D_OSF_SOURCE" ++ ;; ++nto-qnx*) #(vi ++ cf_xopen_source="-D_QNX_SOURCE" ++ ;; ++sco*) #(vi ++ # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ++ ;; ++solaris2.*) #(vi ++ cf_xopen_source="-D__EXTENSIONS__" ++ ;; ++*) ++ ++echo "$as_me:8329: 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 8336 "configure" ++#include "confdefs.h" ++ ++#include ++#include ++#include ++ ++int ++main () ++{ ++ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:8355: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:8358: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:8361: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8364: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_xopen_source=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_save="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8373 "configure" ++#include "confdefs.h" ++ ++#include ++#include ++#include ++ ++int ++main () ++{ ++ ++#ifdef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:8392: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:8395: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:8398: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8401: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_xopen_source=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_xopen_source=$cf_XOPEN_SOURCE ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CPPFLAGS="$cf_save" + + fi + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:8051: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:8416: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 +- if test "$cf_cv_xopen_source" != no ; then ++ ++if test "$cf_cv_xopen_source" != no ; then + + CFLAGS=`echo "$CFLAGS" | \ + sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ +@@ -8060,7 +8426,7 @@ + sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` + +- cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" ++ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" + + cf_fix_cppflags=no + cf_new_cflags= +@@ -8140,7 +8506,7 @@ + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + fi + +- fi ++fi + + cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE + +@@ -8155,16 +8521,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:8158: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:8524: 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}:8164: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:8530: testing if the symbol is already defined go no further ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 8167 "configure" ++#line 8533 "configure" + #include "confdefs.h" + #include + int +@@ -8179,16 +8545,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8182: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8548: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8185: \$? = $ac_status" >&5 ++ echo "$as_me:8551: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8188: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8554: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8191: \$? = $ac_status" >&5 ++ echo "$as_me:8557: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_c_source=no + else +@@ -8209,7 +8575,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 8212 "configure" ++#line 8578 "configure" + #include "confdefs.h" + #include + int +@@ -8224,16 +8590,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8227: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8593: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8230: \$? = $ac_status" >&5 ++ echo "$as_me:8596: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8233: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8599: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8236: \$? = $ac_status" >&5 ++ echo "$as_me:8602: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -8244,15 +8610,15 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "${as_me:-configure}:8247: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:8613: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" + +-echo "${as_me:-configure}:8252: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:8618: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 8255 "configure" ++#line 8621 "configure" + #include "confdefs.h" + #include + int +@@ -8267,16 +8633,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8270: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8636: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8273: \$? = $ac_status" >&5 ++ echo "$as_me:8639: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8276: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8642: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8279: \$? = $ac_status" >&5 ++ echo "$as_me:8645: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -8292,7 +8658,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:8295: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:8661: 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 +@@ -8362,34 +8728,298 @@ + esac + done + +-if test -n "$cf_new_cflags" ; then ++if test -n "$cf_new_cflags" ; then ++ ++ CFLAGS="$CFLAGS $cf_new_cflags" ++fi ++ ++if test -n "$cf_new_cppflags" ; then ++ ++ CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++fi ++ ++if test -n "$cf_new_extra_cppflags" ; then ++ ++ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" ++fi ++ ++fi ++ ++ ;; ++esac ++ ++if test -n "$cf_xopen_source" ; then ++ ++cf_fix_cppflags=no ++cf_new_cflags= ++cf_new_cppflags= ++cf_new_extra_cppflags= ++ ++for cf_add_cflags in $cf_xopen_source ++do ++case $cf_fix_cppflags in ++no) ++ case $cf_add_cflags in #(vi ++ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi ++ case $cf_add_cflags in ++ -D*) ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=yes ++ ++ if test $cf_fix_cppflags = yes ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ elif test "${cf_tst_cflags}" = "\"'" ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ fi ++ ;; ++ esac ++ case "$CPPFLAGS" in ++ *$cf_add_cflags) #(vi ++ ;; ++ *) #(vi ++ case $cf_add_cflags in #(vi ++ -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 ++ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++ *) ++ cf_new_cflags="$cf_new_cflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++yes) ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=no ++ ;; ++esac ++done ++ ++if test -n "$cf_new_cflags" ; then ++ ++ CFLAGS="$CFLAGS $cf_new_cflags" ++fi ++ ++if test -n "$cf_new_cppflags" ; then ++ ++ CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++fi ++ ++if test -n "$cf_new_extra_cppflags" ; then ++ ++ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" ++fi ++ ++fi ++ ++if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then ++ echo "$as_me:8834: 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 8837 "configure" ++#include "confdefs.h" ++#include ++int ++main () ++{ ++ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:8852: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:8855: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:8858: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8861: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_XOPEN_SOURCE_set=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_XOPEN_SOURCE_set=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ echo "$as_me:8870: 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 8875 "configure" ++#include "confdefs.h" ++#include ++int ++main () ++{ ++ ++#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:8890: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:8893: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:8896: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8899: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_XOPEN_SOURCE_set_ok=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_XOPEN_SOURCE_set_ok=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ if test $cf_XOPEN_SOURCE_set_ok = no ++ then ++ { echo "$as_me:8910: WARNING: _XOPEN_SOURCE is lower than requested" >&5 ++echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} ++ fi ++ else ++ ++echo "$as_me:8915: 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 8922 "configure" ++#include "confdefs.h" ++ ++#include ++#include ++#include ++ ++int ++main () ++{ ++ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:8941: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:8944: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:8947: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8950: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_xopen_source=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_save="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8959 "configure" ++#include "confdefs.h" + +- CFLAGS="$CFLAGS $cf_new_cflags" +-fi ++#include ++#include ++#include + +-if test -n "$cf_new_cppflags" ; then ++int ++main () ++{ + +- CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++#ifdef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:8978: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:8981: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:8984: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8987: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_xopen_source=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_xopen_source=$cf_XOPEN_SOURCE + fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CPPFLAGS="$cf_save" + +-if test -n "$cf_new_extra_cppflags" ; then +- +- EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + fi ++rm -f conftest.$ac_objext conftest.$ac_ext + + fi ++echo "$as_me:9002: result: $cf_cv_xopen_source" >&5 ++echo "${ECHO_T}$cf_cv_xopen_source" >&6 + +- ;; +-esac ++if test "$cf_cv_xopen_source" != no ; then + +-if test -n "$cf_xopen_source" ; then ++CFLAGS=`echo "$CFLAGS" | \ ++ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++CPPFLAGS=`echo "$CPPFLAGS" | \ ++ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" + + cf_fix_cppflags=no + cf_new_cflags= + cf_new_cppflags= + cf_new_extra_cppflags= + +-for cf_add_cflags in $cf_xopen_source ++for cf_add_cflags in $cf_temp_xopen_source + do + case $cf_fix_cppflags in + no) +@@ -8464,6 +9094,9 @@ + + fi + ++ fi ++fi ++ + # Check whether --enable-largefile or --disable-largefile was given. + if test "${enable_largefile+set}" = set; then + enableval="$enable_largefile" +@@ -8471,7 +9104,7 @@ + fi; + if test "$enable_largefile" != no; then + +- echo "$as_me:8474: checking for special C compiler options needed for large files" >&5 ++ echo "$as_me:9107: 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 +@@ -8483,7 +9116,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 8486 "configure" ++#line 9119 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -8503,16 +9136,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8506: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9139: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8509: \$? = $ac_status" >&5 ++ echo "$as_me:9142: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8512: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9145: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8515: \$? = $ac_status" >&5 ++ echo "$as_me:9148: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -8522,16 +9155,16 @@ + rm -f conftest.$ac_objext + CC="$CC -n32" + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8525: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9158: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8528: \$? = $ac_status" >&5 ++ echo "$as_me:9161: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8531: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9164: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8534: \$? = $ac_status" >&5 ++ echo "$as_me:9167: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_largefile_CC=' -n32'; break + else +@@ -8545,13 +9178,13 @@ + rm -f conftest.$ac_ext + fi + fi +-echo "$as_me:8548: result: $ac_cv_sys_largefile_CC" >&5 ++echo "$as_me:9181: 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:8554: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++ echo "$as_me:9187: 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 +@@ -8559,7 +9192,7 @@ + while :; do + ac_cv_sys_file_offset_bits=no + cat >conftest.$ac_ext <<_ACEOF +-#line 8562 "configure" ++#line 9195 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -8579,16 +9212,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8582: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9215: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8585: \$? = $ac_status" >&5 ++ echo "$as_me:9218: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8588: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9221: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8591: \$? = $ac_status" >&5 ++ echo "$as_me:9224: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -8597,7 +9230,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 8600 "configure" ++#line 9233 "configure" + #include "confdefs.h" + #define _FILE_OFFSET_BITS 64 + #include +@@ -8618,16 +9251,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8621: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9254: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8624: \$? = $ac_status" >&5 ++ echo "$as_me:9257: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8627: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9260: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8630: \$? = $ac_status" >&5 ++ echo "$as_me:9263: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_file_offset_bits=64; break + else +@@ -8638,7 +9271,7 @@ + break + done + fi +-echo "$as_me:8641: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "$as_me:9274: 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 + +@@ -8648,7 +9281,7 @@ + + fi + rm -rf conftest* +- echo "$as_me:8651: checking for _LARGE_FILES value needed for large files" >&5 ++ echo "$as_me:9284: 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 +@@ -8656,7 +9289,7 @@ + while :; do + ac_cv_sys_large_files=no + cat >conftest.$ac_ext <<_ACEOF +-#line 8659 "configure" ++#line 9292 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -8676,16 +9309,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8679: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9312: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8682: \$? = $ac_status" >&5 ++ echo "$as_me:9315: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8685: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9318: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8688: \$? = $ac_status" >&5 ++ echo "$as_me:9321: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -8694,7 +9327,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 8697 "configure" ++#line 9330 "configure" + #include "confdefs.h" + #define _LARGE_FILES 1 + #include +@@ -8715,16 +9348,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8718: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9351: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8721: \$? = $ac_status" >&5 ++ echo "$as_me:9354: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8724: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9357: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8727: \$? = $ac_status" >&5 ++ echo "$as_me:9360: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_large_files=1; break + else +@@ -8735,7 +9368,7 @@ + break + done + fi +-echo "$as_me:8738: result: $ac_cv_sys_large_files" >&5 ++echo "$as_me:9371: 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 + +@@ -8748,7 +9381,7 @@ + fi + + if test "$enable_largefile" != no ; then +- echo "$as_me:8751: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++ echo "$as_me:9384: 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 +@@ -8756,7 +9389,7 @@ + while :; do + ac_cv_sys_largefile_source=no + cat >conftest.$ac_ext <<_ACEOF +-#line 8759 "configure" ++#line 9392 "configure" + #include "confdefs.h" + #include + int +@@ -8768,16 +9401,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8771: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9404: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8774: \$? = $ac_status" >&5 ++ echo "$as_me:9407: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8777: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9410: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8780: \$? = $ac_status" >&5 ++ echo "$as_me:9413: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -8786,7 +9419,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 8789 "configure" ++#line 9422 "configure" + #include "confdefs.h" + #define _LARGEFILE_SOURCE 1 + #include +@@ -8799,16 +9432,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8802: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9435: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8805: \$? = $ac_status" >&5 ++ echo "$as_me:9438: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8808: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9441: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8811: \$? = $ac_status" >&5 ++ echo "$as_me:9444: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_largefile_source=1; break + else +@@ -8819,7 +9452,7 @@ + break + done + fi +-echo "$as_me:8822: result: $ac_cv_sys_largefile_source" >&5 ++echo "$as_me:9455: 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 + +@@ -8833,13 +9466,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:8836: checking for fseeko" >&5 ++echo "$as_me:9469: 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 8842 "configure" ++#line 9475 "configure" + #include "confdefs.h" + #include + int +@@ -8851,16 +9484,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8854: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9487: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8857: \$? = $ac_status" >&5 ++ echo "$as_me:9490: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8860: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9493: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8863: \$? = $ac_status" >&5 ++ echo "$as_me:9496: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_fseeko=yes + else +@@ -8870,7 +9503,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:8873: result: $ac_cv_func_fseeko" >&5 ++echo "$as_me:9506: result: $ac_cv_func_fseeko" >&5 + echo "${ECHO_T}$ac_cv_func_fseeko" >&6 + if test $ac_cv_func_fseeko = yes; then + +@@ -8891,14 +9524,14 @@ + test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " + test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits " + +- echo "$as_me:8894: checking whether to use struct dirent64" >&5 ++ echo "$as_me:9527: 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 8901 "configure" ++#line 9534 "configure" + #include "confdefs.h" + + #include +@@ -8919,16 +9552,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8922: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9555: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8925: \$? = $ac_status" >&5 ++ echo "$as_me:9558: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8928: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9561: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8931: \$? = $ac_status" >&5 ++ echo "$as_me:9564: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_struct_dirent64=yes + else +@@ -8939,7 +9572,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:8942: result: $cf_cv_struct_dirent64" >&5 ++echo "$as_me:9575: result: $cf_cv_struct_dirent64" >&5 + echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 + test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF + #define HAVE_STRUCT_DIRENT64 1 +@@ -8948,7 +9581,7 @@ + fi + + ### Enable compiling-in rcs id's +-echo "$as_me:8951: checking if RCS identifiers should be compiled-in" >&5 ++echo "$as_me:9584: 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. +@@ -8958,7 +9591,7 @@ + else + with_rcs_ids=no + fi; +-echo "$as_me:8961: result: $with_rcs_ids" >&5 ++echo "$as_me:9594: result: $with_rcs_ids" >&5 + echo "${ECHO_T}$with_rcs_ids" >&6 + test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF + #define USE_RCS_IDS 1 +@@ -8967,7 +9600,7 @@ + ############################################################################### + + ### Note that some functions (such as const) are normally disabled anyway. +-echo "$as_me:8970: checking if you want to build with function extensions" >&5 ++echo "$as_me:9603: 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. +@@ -8977,7 +9610,7 @@ + else + with_ext_funcs=yes + fi; +-echo "$as_me:8980: result: $with_ext_funcs" >&5 ++echo "$as_me:9613: result: $with_ext_funcs" >&5 + echo "${ECHO_T}$with_ext_funcs" >&6 + if test "$with_ext_funcs" = yes ; then + NCURSES_EXT_FUNCS=1 +@@ -8994,7 +9627,7 @@ + fi + + ### use option --enable-const to turn on use of const beyond that in XSI. +-echo "$as_me:8997: checking for extended use of const keyword" >&5 ++echo "$as_me:9630: 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. +@@ -9004,7 +9637,7 @@ + else + with_ext_const=no + fi; +-echo "$as_me:9007: result: $with_ext_const" >&5 ++echo "$as_me:9640: result: $with_ext_const" >&5 + echo "${ECHO_T}$with_ext_const" >&6 + NCURSES_CONST='/*nothing*/' + if test "$with_ext_const" = yes ; then +@@ -9014,7 +9647,7 @@ + ############################################################################### + # These options are relatively safe to experiment with. + +-echo "$as_me:9017: checking if you want all development code" >&5 ++echo "$as_me:9650: 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. +@@ -9024,7 +9657,7 @@ + else + with_develop=no + fi; +-echo "$as_me:9027: result: $with_develop" >&5 ++echo "$as_me:9660: result: $with_develop" >&5 + echo "${ECHO_T}$with_develop" >&6 + + ############################################################################### +@@ -9033,7 +9666,7 @@ + # This is still experimental (20080329), but should ultimately be moved to + # the script-block --with-normal, etc. + +-echo "$as_me:9036: checking if you want to link with the pthread library" >&5 ++echo "$as_me:9669: 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. +@@ -9043,27 +9676,27 @@ + else + with_pthread=no + fi; +-echo "$as_me:9046: result: $with_pthread" >&5 ++echo "$as_me:9679: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + + if test "$with_pthread" != no ; then +- echo "$as_me:9050: checking for pthread.h" >&5 ++ echo "$as_me:9683: 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 9056 "configure" ++#line 9689 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:9060: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:9693: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:9066: \$? = $ac_status" >&5 ++ echo "$as_me:9699: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -9082,7 +9715,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:9085: result: $ac_cv_header_pthread_h" >&5 ++echo "$as_me:9718: 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 + +@@ -9090,12 +9723,14 @@ + #define HAVE_PTHREADS_H 1 + EOF + +- echo "$as_me:9093: checking if we can link with the pthread library" >&5 +-echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6 +- cf_save_LIBS="$LIBS" +- LIBS="-lpthread $LIBS" +- cat >conftest.$ac_ext <<_ACEOF +-#line 9098 "configure" ++ for cf_lib_pthread in pthread c_r ++ do ++ echo "$as_me:9728: 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" ++ LIBS="-l$cf_lib_pthread $LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 9733 "configure" + #include "confdefs.h" + + #include +@@ -9104,23 +9739,24 @@ + main () + { + +- int rc = pthread_create(0,0,0,0); ++ int rc = pthread_create(0,0,0,0); ++ int r2 = pthread_mutexattr_settype(0, 0); + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9114: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9750: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9117: \$? = $ac_status" >&5 ++ echo "$as_me:9753: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9120: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9756: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9123: \$? = $ac_status" >&5 ++ echo "$as_me:9759: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + with_pthread=yes + else +@@ -9129,27 +9765,29 @@ + with_pthread=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- LIBS="$cf_save_LIBS" +- echo "$as_me:9133: result: $with_pthread" >&5 ++ LIBS="$cf_save_LIBS" ++ echo "$as_me:9769: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 ++ test "$with_pthread" = yes && break ++ done + +- if test "$with_pthread" = yes ; then +- LIBS="-lpthread $LIBS" +- cat >>confdefs.h <<\EOF ++ if test "$with_pthread" = yes ; then ++ LIBS="-l$cf_lib_pthread $LIBS" ++ cat >>confdefs.h <<\EOF + #define HAVE_LIBPTHREADS 1 + EOF + +- else +- { { echo "$as_me:9143: error: Cannot link with pthread library" >&5 ++ else ++ { { echo "$as_me:9781: error: Cannot link with pthread library" >&5 + echo "$as_me: error: Cannot link with pthread library" >&2;} + { (exit 1); exit 1; }; } +- fi ++ fi + + fi + + fi + +-echo "$as_me:9152: checking if you want to use weak-symbols for pthreads" >&5 ++echo "$as_me:9790: 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. +@@ -9159,18 +9797,18 @@ + else + use_weak_symbols=no + fi; +-echo "$as_me:9162: result: $use_weak_symbols" >&5 ++echo "$as_me:9800: result: $use_weak_symbols" >&5 + echo "${ECHO_T}$use_weak_symbols" >&6 + if test "$use_weak_symbols" = yes ; then + +-echo "$as_me:9166: checking if $CC supports weak symbols" >&5 ++echo "$as_me:9804: 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 9173 "configure" ++#line 9811 "configure" + #include "confdefs.h" + + #include +@@ -9196,16 +9834,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9199: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9837: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9202: \$? = $ac_status" >&5 ++ echo "$as_me:9840: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9205: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9843: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9208: \$? = $ac_status" >&5 ++ echo "$as_me:9846: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_weak_symbols=yes + else +@@ -9216,7 +9854,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:9219: result: $cf_cv_weak_symbols" >&5 ++echo "$as_me:9857: result: $cf_cv_weak_symbols" >&5 + echo "${ECHO_T}$cf_cv_weak_symbols" >&6 + + else +@@ -9243,13 +9881,13 @@ + fi + + # OpenSUSE is installing ncurses6, using reentrant option. +-echo "$as_me:9246: checking for _nc_TABSIZE" >&5 ++echo "$as_me:9884: 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 9252 "configure" ++#line 9890 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char _nc_TABSIZE (); below. */ +@@ -9272,7 +9910,7 @@ + #if defined (__stub__nc_TABSIZE) || defined (__stub____nc_TABSIZE) + choke me + #else +-f = _nc_TABSIZE; ++f = _nc_TABSIZE; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -9280,16 +9918,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9283: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9921: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9286: \$? = $ac_status" >&5 ++ echo "$as_me:9924: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9289: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9927: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9292: \$? = $ac_status" >&5 ++ echo "$as_me:9930: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func__nc_TABSIZE=yes + else +@@ -9299,7 +9937,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:9302: result: $ac_cv_func__nc_TABSIZE" >&5 ++echo "$as_me:9940: 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 +@@ -9311,7 +9949,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:9314: checking if you want experimental reentrant code" >&5 ++echo "$as_me:9952: 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. +@@ -9321,7 +9959,7 @@ + else + with_reentrant=$assume_reentrant + fi; +-echo "$as_me:9324: result: $with_reentrant" >&5 ++echo "$as_me:9962: result: $with_reentrant" >&5 + echo "${ECHO_T}$with_reentrant" >&6 + if test "$with_reentrant" = yes ; then + cf_cv_enable_reentrant=1 +@@ -9343,7 +9981,7 @@ + + ### Allow using a different wrap-prefix + if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then +- echo "$as_me:9346: checking for prefix used to wrap public variables" >&5 ++ echo "$as_me:9984: 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. +@@ -9353,7 +9991,7 @@ + else + NCURSES_WRAP_PREFIX=_nc_ + fi; +- echo "$as_me:9356: result: $NCURSES_WRAP_PREFIX" >&5 ++ echo "$as_me:9994: result: $NCURSES_WRAP_PREFIX" >&5 + echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 + else + NCURSES_WRAP_PREFIX=_nc_ +@@ -9366,26 +10004,46 @@ + ############################################################################### + + ### use option --disable-echo to suppress full display compiling commands +-echo "$as_me:9369: checking if you want to display full commands during build" >&5 +-echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6 ++ ++echo "$as_me:10008: 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. + if test "${enable_echo+set}" = set; then + enableval="$enable_echo" +- with_echo=$enableval ++ test "$enableval" != no && enableval=yes ++ if test "$enableval" != "yes" ; then ++ ++ ECHO_LT='--silent' ++ ECHO_LD='@echo linking $@;' ++ RULE_CC='@echo compiling $<' ++ SHOW_CC='@echo compiling $@' ++ ECHO_CC='@' ++ ++ else ++ ++ ECHO_LT='' ++ ECHO_LD='' ++ RULE_CC='' ++ SHOW_CC='' ++ ECHO_CC='' ++ ++ fi + else +- with_echo=yes ++ enableval=yes ++ ++ ECHO_LT='' ++ ECHO_LD='' ++ RULE_CC='' ++ SHOW_CC='' ++ ECHO_CC='' ++ + fi; +-if test "$with_echo" = yes; then +- ECHO_LINK= +-else +- ECHO_LINK='@ echo linking $@ ... ;' +-fi +-echo "$as_me:9384: result: $with_echo" >&5 +-echo "${ECHO_T}$with_echo" >&6 ++echo "$as_me:10042: result: $enableval" >&5 ++echo "${ECHO_T}$enableval" >&6 + + ### use option --enable-warnings to turn on all gcc warnings +-echo "$as_me:9388: checking if you want to see compiler warnings" >&5 ++echo "$as_me:10046: checking if you want to see compiler warnings" >&5 + echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 + + # Check whether --enable-warnings or --disable-warnings was given. +@@ -9393,7 +10051,7 @@ + enableval="$enable_warnings" + with_warnings=$enableval + fi; +-echo "$as_me:9396: result: $with_warnings" >&5 ++echo "$as_me:10054: result: $with_warnings" >&5 + echo "${ECHO_T}$with_warnings" >&6 + + if test "x$with_warnings" = "xyes"; then +@@ -9405,12 +10063,12 @@ + if test "$GCC" = yes ; then + case $host_os in + linux*|gnu*) +- echo "$as_me:9408: checking if this is really Intel C compiler" >&5 ++ echo "$as_me:10066: 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 9413 "configure" ++#line 10071 "configure" + #include "confdefs.h" + + int +@@ -9427,16 +10085,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9430: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10088: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9433: \$? = $ac_status" >&5 ++ echo "$as_me:10091: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9436: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10094: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9439: \$? = $ac_status" >&5 ++ echo "$as_me:10097: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + INTEL_COMPILER=yes + cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +@@ -9447,14 +10105,63 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:9450: result: $INTEL_COMPILER" >&5 ++ echo "$as_me:10108: result: $INTEL_COMPILER" >&5 + echo "${ECHO_T}$INTEL_COMPILER" >&6 + ;; + esac + fi + ++CLANG_COMPILER=no ++ ++if test "$GCC" = yes ; then ++ echo "$as_me:10117: 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" ++ CFLAGS="$CFLAGS -Qunused-arguments" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 10122 "configure" ++#include "confdefs.h" ++ ++int ++main () ++{ ++ ++#ifdef __clang__ ++#else ++make an error ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:10139: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:10142: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:10145: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:10148: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ CLANG_COMPILER=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" ++ ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$cf_save_CFLAGS" ++ echo "$as_me:10159: result: $CLANG_COMPILER" >&5 ++echo "${ECHO_T}$CLANG_COMPILER" >&6 ++fi ++ + cat > conftest.$ac_ext <&5 ++ { echo "$as_me:10181: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="-Wall" +@@ -9487,12 +10194,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:9490: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:10197: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9493: \$? = $ac_status" >&5 ++ echo "$as_me:10200: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:9495: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:10202: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -9501,7 +10208,7 @@ + + elif test "$GCC" = yes + then +- { echo "$as_me:9504: checking for $CC warning options..." >&5 ++ { echo "$as_me:10211: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS= +@@ -9521,12 +10228,12 @@ + Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:9524: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:10231: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9527: \$? = $ac_status" >&5 ++ echo "$as_me:10234: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:9529: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:10236: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case $cf_opt in #(vi + Wcast-qual) #(vi +@@ -9537,7 +10244,17 @@ + [34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:9540: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:10247: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++ ++ continue;; ++ esac ++ ;; ++ Wpointer-arith) #(vi ++ case $GCC_VERSION in ++ [12].*) ++ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 ++ ++echo "${as_me:-configure}:10257: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -9570,10 +10287,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:9573: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:10290: checking for $CC __attribute__ directives..." >&5 + echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + cat > conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:10342: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9628: \$? = $ac_status" >&5 ++ echo "$as_me:10345: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:9630: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:10347: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case $cf_attribute in #(vi +@@ -9663,7 +10380,7 @@ + fi + + ### use option --enable-assertions to turn on generation of assertion code +-echo "$as_me:9666: checking if you want to enable runtime assertions" >&5 ++echo "$as_me:10383: 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. +@@ -9673,16 +10390,12 @@ + else + with_assertions=no + fi; +-echo "$as_me:9676: result: $with_assertions" >&5 ++echo "$as_me:10393: result: $with_assertions" >&5 + echo "${ECHO_T}$with_assertions" >&6 + if test -n "$GCC" + then + if test "$with_assertions" = no + then +- cat >>confdefs.h <<\EOF +-#define NDEBUG 1 +-EOF +- + CPPFLAGS="$CPPFLAGS -DNDEBUG" + else + +@@ -9727,7 +10440,7 @@ + ;; + esac + +-echo "$as_me:9730: checking whether to add trace feature to all models" >&5 ++echo "$as_me:10443: 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. +@@ -9737,7 +10450,7 @@ + else + cf_with_trace=$cf_all_traces + fi; +-echo "$as_me:9740: result: $cf_with_trace" >&5 ++echo "$as_me:10453: result: $cf_with_trace" >&5 + echo "${ECHO_T}$cf_with_trace" >&6 + + if test "$cf_with_trace" = yes ; then +@@ -9830,13 +10543,13 @@ + *mingw32*) #(vi + ;; + *) +-echo "$as_me:9833: checking for gettimeofday" >&5 ++echo "$as_me:10546: 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 9839 "configure" ++#line 10552 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gettimeofday (); below. */ +@@ -9859,7 +10572,7 @@ + #if defined (__stub_gettimeofday) || defined (__stub___gettimeofday) + choke me + #else +-f = gettimeofday; ++f = gettimeofday; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -9867,16 +10580,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9870: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10583: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9873: \$? = $ac_status" >&5 ++ echo "$as_me:10586: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9876: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10589: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9879: \$? = $ac_status" >&5 ++ echo "$as_me:10592: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gettimeofday=yes + else +@@ -9886,7 +10599,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:9889: result: $ac_cv_func_gettimeofday" >&5 ++echo "$as_me:10602: result: $ac_cv_func_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 + if test $ac_cv_func_gettimeofday = yes; then + cat >>confdefs.h <<\EOF +@@ -9895,7 +10608,7 @@ + + else + +-echo "$as_me:9898: checking for gettimeofday in -lbsd" >&5 ++echo "$as_me:10611: 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 +@@ -9903,7 +10616,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 9906 "configure" ++#line 10619 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -9922,16 +10635,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9925: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10638: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9928: \$? = $ac_status" >&5 ++ echo "$as_me:10641: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9931: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10644: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9934: \$? = $ac_status" >&5 ++ echo "$as_me:10647: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_gettimeofday=yes + else +@@ -9942,7 +10655,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:9945: result: $ac_cv_lib_bsd_gettimeofday" >&5 ++echo "$as_me:10658: 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 + cat >>confdefs.h <<\EOF +@@ -9957,13 +10670,13 @@ + esac + + ### Checks for header files. +-echo "$as_me:9960: checking for ANSI C header files" >&5 ++echo "$as_me:10673: 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 9966 "configure" ++#line 10679 "configure" + #include "confdefs.h" + #include + #include +@@ -9971,13 +10684,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:9974: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:10687: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:9980: \$? = $ac_status" >&5 ++ echo "$as_me:10693: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -9999,7 +10712,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 10002 "configure" ++#line 10715 "configure" + #include "confdefs.h" + #include + +@@ -10017,7 +10730,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 10020 "configure" ++#line 10733 "configure" + #include "confdefs.h" + #include + +@@ -10038,7 +10751,7 @@ + : + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10041 "configure" ++#line 10754 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -10064,15 +10777,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:10067: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10780: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10070: \$? = $ac_status" >&5 ++ echo "$as_me:10783: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:10072: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10785: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10075: \$? = $ac_status" >&5 ++ echo "$as_me:10788: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -10085,7 +10798,7 @@ + fi + fi + fi +-echo "$as_me:10088: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:10801: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -10098,13 +10811,13 @@ + ac_header_dirent=no + for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +-echo "$as_me:10101: checking for $ac_hdr that defines DIR" >&5 ++echo "$as_me:10814: 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 10107 "configure" ++#line 10820 "configure" + #include "confdefs.h" + #include + #include <$ac_hdr> +@@ -10119,16 +10832,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10122: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10835: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10125: \$? = $ac_status" >&5 ++ echo "$as_me:10838: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10128: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10841: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10131: \$? = $ac_status" >&5 ++ echo "$as_me:10844: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" + else +@@ -10138,7 +10851,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:10141: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:10854: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:10867: 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 +@@ -10159,7 +10872,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldir $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10162 "configure" ++#line 10875 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10178,16 +10891,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10181: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10894: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10184: \$? = $ac_status" >&5 ++ echo "$as_me:10897: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10187: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10900: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10190: \$? = $ac_status" >&5 ++ echo "$as_me:10903: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dir_opendir=yes + else +@@ -10198,14 +10911,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10201: result: $ac_cv_lib_dir_opendir" >&5 ++echo "$as_me:10914: 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:10208: checking for opendir in -lx" >&5 ++ echo "$as_me:10921: 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 +@@ -10213,7 +10926,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lx $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10216 "configure" ++#line 10929 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10232,16 +10945,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10235: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10948: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10238: \$? = $ac_status" >&5 ++ echo "$as_me:10951: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10241: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10954: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10244: \$? = $ac_status" >&5 ++ echo "$as_me:10957: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_x_opendir=yes + else +@@ -10252,7 +10965,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10255: result: $ac_cv_lib_x_opendir" >&5 ++echo "$as_me:10968: 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" +@@ -10260,13 +10973,13 @@ + + fi + +-echo "$as_me:10263: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:10976: 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 10269 "configure" ++#line 10982 "configure" + #include "confdefs.h" + #include + #include +@@ -10282,16 +10995,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10285: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10998: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10288: \$? = $ac_status" >&5 ++ echo "$as_me:11001: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10291: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11004: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10294: \$? = $ac_status" >&5 ++ echo "$as_me:11007: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_time=yes + else +@@ -10301,7 +11014,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:10304: result: $ac_cv_header_time" >&5 ++echo "$as_me:11017: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -10319,7 +11032,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return=return + +-echo "$as_me:10322: checking for $CC option to accept ANSI C" >&5 ++echo "$as_me:11035: 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 +@@ -10327,7 +11040,7 @@ + ac_cv_prog_cc_stdc=no + ac_save_CC=$CC + cat >conftest.$ac_ext <<_ACEOF +-#line 10330 "configure" ++#line 11043 "configure" + #include "confdefs.h" + #include + #include +@@ -10376,16 +11089,16 @@ + do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10379: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11092: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10382: \$? = $ac_status" >&5 ++ echo "$as_me:11095: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10385: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11098: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10388: \$? = $ac_status" >&5 ++ echo "$as_me:11101: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg + break +@@ -10402,21 +11115,21 @@ + + case "x$ac_cv_prog_cc_stdc" in + x|xno) +- echo "$as_me:10405: result: none needed" >&5 ++ echo "$as_me:11118: result: none needed" >&5 + echo "${ECHO_T}none needed" >&6 ;; + *) +- echo "$as_me:10408: result: $ac_cv_prog_cc_stdc" >&5 ++ echo "$as_me:11121: result: $ac_cv_prog_cc_stdc" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; + esac + +-echo "$as_me:10413: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:11126: 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 10419 "configure" ++#line 11132 "configure" + #include "confdefs.h" + + int +@@ -10474,16 +11187,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10477: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11190: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10480: \$? = $ac_status" >&5 ++ echo "$as_me:11193: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10483: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11196: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10486: \$? = $ac_status" >&5 ++ echo "$as_me:11199: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_const=yes + else +@@ -10493,7 +11206,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:10496: result: $ac_cv_c_const" >&5 ++echo "$as_me:11209: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -10505,7 +11218,7 @@ + + ### Checks for external-data + +-echo "$as_me:10508: checking if data-only library module links" >&5 ++echo "$as_me:11221: 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 +@@ -10513,20 +11226,20 @@ + + rm -f conftest.a + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:11232: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10522: \$? = $ac_status" >&5 ++ echo "$as_me:11235: \$? = $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:11255: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10545: \$? = $ac_status" >&5 ++ echo "$as_me:11258: \$? = $ac_status" >&5 + (exit $ac_status); }; then + mv conftest.o func.o && \ + ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null +@@ -10555,7 +11268,7 @@ + cf_cv_link_dataonly=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10558 "configure" ++#line 11271 "configure" + #include "confdefs.h" + + int main() +@@ -10566,15 +11279,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:10569: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11282: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10572: \$? = $ac_status" >&5 ++ echo "$as_me:11285: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:10574: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11287: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10577: \$? = $ac_status" >&5 ++ echo "$as_me:11290: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_link_dataonly=yes + else +@@ -10589,7 +11302,7 @@ + + fi + +-echo "$as_me:10592: result: $cf_cv_link_dataonly" >&5 ++echo "$as_me:11305: result: $cf_cv_link_dataonly" >&5 + echo "${ECHO_T}$cf_cv_link_dataonly" >&6 + + if test "$cf_cv_link_dataonly" = no ; then +@@ -10602,7 +11315,7 @@ + + ### Checks for library functions. + +-echo "$as_me:10605: checking for working mkstemp" >&5 ++echo "$as_me:11318: 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 +@@ -10610,68 +11323,10 @@ + + rm -rf conftest* + if test "$cross_compiling" = yes; then +- echo "$as_me:10613: 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 10619 "configure" +-#include "confdefs.h" +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char mkstemp (); below. */ +-#include +-/* 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 mkstemp (); +-char (*f) (); +- +-int +-main () +-{ +-/* The GNU C library defines this 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_mkstemp) || defined (__stub___mkstemp) +-choke me +-#else +-f = mkstemp; +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10650: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:10653: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10656: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:10659: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_func_mkstemp=yes +-else +- echo "$as_me: failed program was:" >&5 +-cat conftest.$ac_ext >&5 +-ac_cv_func_mkstemp=no +-fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-fi +-echo "$as_me:10669: result: $ac_cv_func_mkstemp" >&5 +-echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 +- ++ cf_cv_func_mkstemp=maybe + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10674 "configure" ++#line 11329 "configure" + #include "confdefs.h" + + #include +@@ -10709,15 +11364,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:10712: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11367: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10715: \$? = $ac_status" >&5 ++ echo "$as_me:11370: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:10717: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11372: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10720: \$? = $ac_status" >&5 ++ echo "$as_me:11375: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_mkstemp=yes + +@@ -10732,8 +11387,69 @@ + fi + + fi +-echo "$as_me:10735: result: $cf_cv_func_mkstemp" >&5 ++echo "$as_me:11390: 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:11393: 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 11399 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char mkstemp (); below. */ ++#include ++/* 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 mkstemp (); ++char (*f) (); ++ ++int ++main () ++{ ++/* The GNU C library defines this 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_mkstemp) || defined (__stub___mkstemp) ++choke me ++#else ++f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:11430: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:11433: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:11436: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:11439: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_mkstemp=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_mkstemp=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:11449: result: $ac_cv_func_mkstemp" >&5 ++echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 ++ ++fi + if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then + cat >>confdefs.h <<\EOF + #define HAVE_MKSTEMP 1 +@@ -10741,13 +11457,13 @@ + + fi + +-echo "$as_me:10744: checking return type of signal handlers" >&5 ++echo "$as_me:11460: checking return type of signal handlers" >&5 + echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 + if test "${ac_cv_type_signal+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10750 "configure" ++#line 11466 "configure" + #include "confdefs.h" + #include + #include +@@ -10769,16 +11485,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10772: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11488: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10775: \$? = $ac_status" >&5 ++ echo "$as_me:11491: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10778: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11494: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10781: \$? = $ac_status" >&5 ++ echo "$as_me:11497: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_signal=void + else +@@ -10788,7 +11504,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:10791: result: $ac_cv_type_signal" >&5 ++echo "$as_me:11507: result: $ac_cv_type_signal" >&5 + echo "${ECHO_T}$ac_cv_type_signal" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:11525: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_gnat_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10820,7 +11537,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_gnat_exists="yes" +-echo "$as_me:10823: found $ac_dir/$ac_word" >&5 ++echo "$as_me:11540: found $ac_dir/$ac_word" >&5 + break + done + +@@ -10829,31 +11546,32 @@ + fi + gnat_exists=$ac_cv_prog_gnat_exists + if test -n "$gnat_exists"; then +- echo "$as_me:10832: result: $gnat_exists" >&5 ++ echo "$as_me:11549: result: $gnat_exists" >&5 + echo "${ECHO_T}$gnat_exists" >&6 + else +- echo "$as_me:10835: result: no" >&5 ++ echo "$as_me:11552: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$ac_cv_prog_gnat_exists" = no; then + cf_ada_make= ++ cf_cv_prog_gnat_correct=no + else + +-echo "$as_me:10843: checking for gnat version" >&5 ++echo "$as_me:11561: checking for gnat version" >&5 + echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 + cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ + grep '[0-9].[0-9][0-9]*' |\ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` +-echo "$as_me:10848: result: $cf_gnat_version" >&5 ++echo "$as_me:11566: result: $cf_gnat_version" >&5 + echo "${ECHO_T}$cf_gnat_version" >&6 + + case $cf_gnat_version in #(vi +-3.1[1-9]*|3.[2-9]*|[4-9].*) #(vi ++3.1[1-9]*|3.[2-9]*|[4-9].*|20[0-9][0-9]) #(vi + cf_cv_prog_gnat_correct=yes + ;; + *) +- { echo "$as_me:10856: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:11574: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} + cf_cv_prog_gnat_correct=no + ;; +@@ -10861,7 +11579,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:10864: checking for $ac_word" >&5 ++echo "$as_me:11582: 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 +@@ -10876,7 +11594,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:10879: found $ac_dir/$ac_word" >&5 ++echo "$as_me:11597: found $ac_dir/$ac_word" >&5 + break + done + +@@ -10885,10 +11603,10 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:10888: result: $M4_exists" >&5 ++ echo "$as_me:11606: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:10891: result: no" >&5 ++ echo "$as_me:11609: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -10897,7 +11615,7 @@ + echo Ada95 binding required program m4 not found. Ada95 binding disabled. + fi + if test "$cf_cv_prog_gnat_correct" = yes; then +- echo "$as_me:10900: checking if GNAT works" >&5 ++ echo "$as_me:11618: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf conftest* *~conftest* +@@ -10925,30 +11643,34 @@ + fi + rm -rf conftest* *~conftest* + +- echo "$as_me:10928: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:11646: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + fi + + if test "$cf_cv_prog_gnat_correct" = yes; then + +- # make ADAFLAGS consistent with CFLAGS +- case "$CFLAGS" in +- *-g*) ++ echo "$as_me:11653: checking optimization options for ADAFLAGS" >&5 ++echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ++ case "$CFLAGS" in ++ *-g*) + + ADAFLAGS="$ADAFLAGS -g" + +- ;; +- esac +- case "$CFLAGS" in +- *-O*) ++ ;; ++ esac ++ case "$CFLAGS" in ++ *-O*) ++ cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[ ].*//'` + +- ADAFLAGS="$ADAFLAGS -O3" ++ ADAFLAGS="$ADAFLAGS $cf_O_flag" + +- ;; +- esac ++ ;; ++ esac ++ echo "$as_me:11670: result: $ADAFLAGS" >&5 ++echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:10951: checking if GNAT supports generics" >&5 ++echo "$as_me:11673: checking if GNAT supports generics" >&5 + echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 + case $cf_gnat_version in #(vi + 3.[1-9]*|[4-9].*) #(vi +@@ -10958,7 +11680,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:10961: result: $cf_gnat_generics" >&5 ++echo "$as_me:11683: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -10970,7 +11692,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:10973: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:11695: 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 +@@ -11018,7 +11740,7 @@ + rm -rf conftest* *~conftest* + + fi +-echo "$as_me:11021: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:11743: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test $cf_cv_gnat_sigint = yes ; then +@@ -11027,7 +11749,7 @@ + USE_GNAT_SIGINT="#" + fi + +-echo "$as_me:11030: checking if GNAT pragma Unreferenced works" >&5 ++echo "$as_me:11752: checking if GNAT pragma Unreferenced works" >&5 + echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 + if test "${cf_cv_pragma_unreferenced+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -11058,7 +11780,7 @@ + rm -rf conftest* *~conftest* + + fi +-echo "$as_me:11061: result: $cf_cv_pragma_unreferenced" >&5 ++echo "$as_me:11783: result: $cf_cv_pragma_unreferenced" >&5 + echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 + + # if the pragma is supported, use it (needed in the Trace code). +@@ -11071,7 +11793,7 @@ + cf_gnat_libraries=no + cf_gnat_projects=no + +-echo "$as_me:11074: checking if GNAT supports project files" >&5 ++echo "$as_me:11796: checking if GNAT supports project files" >&5 + echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 + case $cf_gnat_version in #(vi + 3.[0-9]*) #(vi +@@ -11139,14 +11861,14 @@ + esac + ;; + esac +-echo "$as_me:11142: result: $cf_gnat_projects" >&5 ++echo "$as_me:11864: result: $cf_gnat_projects" >&5 + echo "${ECHO_T}$cf_gnat_projects" >&6 + + if test $cf_gnat_projects = yes + then +- echo "$as_me:11147: checking if GNAT supports libraries" >&5 ++ echo "$as_me:11869: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:11149: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:11871: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -11166,7 +11888,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:11169: checking for ada-compiler" >&5 ++echo "$as_me:11891: checking for ada-compiler" >&5 + echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 + + # Check whether --with-ada-compiler or --without-ada-compiler was given. +@@ -11177,12 +11899,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:11180: result: $cf_ada_compiler" >&5 ++echo "$as_me:11902: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:11185: checking for ada-include" >&5 ++echo "$as_me:11907: checking for ada-include" >&5 + echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 + + # Check whether --with-ada-include or --without-ada-include was given. +@@ -11206,7 +11928,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval withval="$withval" + case ".$withval" in #(vi + .NONE/*) +@@ -11218,7 +11940,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:11221: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:11943: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -11227,10 +11949,10 @@ + fi + ADA_INCLUDE="$withval" + +-echo "$as_me:11230: result: $ADA_INCLUDE" >&5 ++echo "$as_me:11952: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:11233: checking for ada-objects" >&5 ++echo "$as_me:11955: checking for ada-objects" >&5 + echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 + + # Check whether --with-ada-objects or --without-ada-objects was given. +@@ -11254,7 +11976,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval withval="$withval" + case ".$withval" in #(vi + .NONE/*) +@@ -11266,7 +11988,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:11269: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:11991: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -11275,10 +11997,10 @@ + fi + ADA_OBJECTS="$withval" + +-echo "$as_me:11278: result: $ADA_OBJECTS" >&5 ++echo "$as_me:12000: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:11281: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:12003: checking if an Ada95 shared-library should be built" >&5 + echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 + + # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. +@@ -11288,7 +12010,7 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:11291: result: $with_ada_sharedlib" >&5 ++echo "$as_me:12013: result: $with_ada_sharedlib" >&5 + echo "${ECHO_T}$with_ada_sharedlib" >&6 + + ADA_SHAREDLIB='lib$(LIB_NAME).so.1' +@@ -11304,12 +12026,12 @@ + fi + + else +- { { echo "$as_me:11307: error: No usable Ada compiler found" >&5 ++ { { echo "$as_me:12029: 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:11312: error: The Ada compiler is needed for this package" >&5 ++ { { echo "$as_me:12034: 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 +@@ -11317,7 +12039,9 @@ + ################################################################################ + + # not needed +-TINFO_ARGS2= ++TINFO_LDFLAGS2= ++ ++TINFO_LIBS= + + ### Construct the list of include-directories to be generated + +@@ -11354,7 +12078,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:11357: checking default library suffix" >&5 ++echo "$as_me:12081: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -11365,10 +12089,10 @@ + shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:11368: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:12092: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:11371: checking default library-dependency suffix" >&5 ++echo "$as_me:12095: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in #(vi +@@ -11390,11 +12114,11 @@ + ;; + shared) #(vi + case $cf_cv_system_name in +- aix[56]*) #(vi ++ aix[5-7]*) #(vi + DFT_LIB_SUFFIX='.a' + DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX + ;; +- cygwin*) #(vi ++ cygwin*|mingw*) #(vi + DFT_LIB_SUFFIX='.dll' + DFT_DEP_SUFFIX='.dll.a' + ;; +@@ -11421,10 +12145,10 @@ + esac + test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" + test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" +-echo "$as_me:11424: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:12148: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:11427: checking default object directory" >&5 ++echo "$as_me:12151: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -11440,7 +12164,7 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:11443: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:12167: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + ### Set up low-level terminfo dependencies for makefiles. +@@ -11656,7 +12380,7 @@ + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:11659: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:12383: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL +@@ -11788,7 +12512,7 @@ + cat >>$CONFIG_STATUS <&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -11851,7 +12575,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:11854: error: unrecognized option: $1 ++ -*) { { echo "$as_me:12578: 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;} +@@ -11870,7 +12594,7 @@ + ## Running config.status. ## + ## ----------------------- ## + +-This file was extended by $as_me 2.52.20101002, executed with ++This file was extended by $as_me 2.52.20120811, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS +@@ -11892,8 +12616,8 @@ + AWK="$AWK" + DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX" + DFT_LWR_MODEL="$DFT_LWR_MODEL" +-ECHO_LINK="$ECHO_LINK" + LIB_NAME="$LIB_NAME" ++LIB_PREFIX="$LIB_PREFIX" + LIB_SUFFIX="$LIB_SUFFIX" + LN_S="$LN_S" + NCURSES_MAJOR="$NCURSES_MAJOR" +@@ -11922,7 +12646,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:11925: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:12649: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -11981,6 +12705,7 @@ + s,@bindir@,$bindir,;t t + s,@sbindir@,$sbindir,;t t + s,@libexecdir@,$libexecdir,;t t ++s,@datarootdir@,$datarootdir,;t t + s,@datadir@,$datadir,;t t + s,@sysconfdir@,$sysconfdir,;t t + s,@sharedstatedir@,$sharedstatedir,;t t +@@ -12061,6 +12786,7 @@ + s,@DFT_LWR_MODEL@,$DFT_LWR_MODEL,;t t + s,@DFT_UPR_MODEL@,$DFT_UPR_MODEL,;t t + s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t ++s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t + s,@NCURSES_MAJOR@,$NCURSES_MAJOR,;t t + s,@NCURSES_MINOR@,$NCURSES_MINOR,;t t + s,@NCURSES_PATCH@,$NCURSES_PATCH,;t t +@@ -12083,13 +12809,18 @@ + s,@LOCAL_LDFLAGS@,$LOCAL_LDFLAGS,;t t + s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t + s,@INSTALL_LIB@,$INSTALL_LIB,;t t ++s,@RPATH_LIST@,$RPATH_LIST,;t t + s,@BROKEN_LINKER@,$BROKEN_LINKER,;t t + s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t + s,@NCURSES_CONST@,$NCURSES_CONST,;t t + s,@PTHREAD@,$PTHREAD,;t t + s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t + s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t +-s,@ECHO_LINK@,$ECHO_LINK,;t t ++s,@ECHO_LT@,$ECHO_LT,;t t ++s,@ECHO_LD@,$ECHO_LD,;t t ++s,@RULE_CC@,$RULE_CC,;t t ++s,@SHOW_CC@,$SHOW_CC,;t t ++s,@ECHO_CC@,$ECHO_CC,;t t + s,@ADAFLAGS@,$ADAFLAGS,;t t + s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t + s,@ADA_TRACE@,$ADA_TRACE,;t t +@@ -12109,7 +12840,8 @@ + s,@ADA_OBJECTS@,$ADA_OBJECTS,;t t + s,@ADA_SHAREDLIB@,$ADA_SHAREDLIB,;t t + s,@MAKE_ADA_SHAREDLIB@,$MAKE_ADA_SHAREDLIB,;t t +-s,@TINFO_ARGS2@,$TINFO_ARGS2,;t t ++s,@TINFO_LDFLAGS2@,$TINFO_LDFLAGS2,;t t ++s,@TINFO_LIBS@,$TINFO_LIBS,;t t + s,@ACPPFLAGS@,$ACPPFLAGS,;t t + s,@DFT_ARG_SUFFIX@,$DFT_ARG_SUFFIX,;t t + s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t +@@ -12237,7 +12969,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:12240: creating $ac_file" >&5 ++ { echo "$as_me:12972: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -12255,7 +12987,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:12258: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:12990: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -12268,7 +13000,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:12271: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:13003: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -12334,7 +13066,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:12337: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:13069: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -12345,7 +13077,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:12348: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:13080: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -12358,7 +13090,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:12361: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:13093: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -12416,7 +13148,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:12419: $ac_file is unchanged" >&5 ++ { echo "$as_me:13151: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +diff -Naur ncurses-5.9.orig/Ada95/configure.in ncurses-5.9/Ada95/configure.in +--- ncurses-5.9.orig/Ada95/configure.in 2012-08-25 19:57:59.379901042 +0000 ++++ ncurses-5.9/Ada95/configure.in 2012-08-25 19:58:01.333225137 +0000 +@@ -1,5 +1,5 @@ + dnl*************************************************************************** +-dnl Copyright (c) 2010,2011 Free Software Foundation, Inc. * ++dnl Copyright (c) 2010-2011,2012 Free Software Foundation, Inc. * + dnl * + dnl Permission is hereby granted, free of charge, to any person obtaining a * + dnl copy of this software and associated documentation files (the * +@@ -28,14 +28,14 @@ + dnl + dnl Author: Thomas E. Dickey + dnl +-dnl $Id: configure.in,v 1.30 2011/03/31 22:49:22 tom Exp $ ++dnl $Id: configure.in,v 1.41 2012/05/05 20:54:52 tom Exp $ + dnl Process this file with autoconf to produce a configure script. + dnl + dnl See http://invisible-island.net/autoconf/ for additional information. + dnl + dnl --------------------------------------------------------------------------- + AC_PREREQ(2.13.20020210) +-AC_REVISION($Revision: 1.30 $) ++AC_REVISION($Revision: 1.41 $) + AC_INIT(gen/gen.c) + AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) + +@@ -54,7 +54,7 @@ + CF_CFG_DEFAULTS + + ### Checks for programs. +-AC_PROG_CC ++AC_PROG_CC(gnatgcc gcc cc) + CF_GCC_VERSION + + AC_PROG_CPP +@@ -75,28 +75,8 @@ + + # if we find pkg-config, check if we should install the ".pc" files. + CF_PKG_CONFIG +- +-if test "$PKG_CONFIG" != none ; then +- AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG) +- +- # Leave this as something that can be overridden in the environment. +- if test -z "$PKG_CONFIG_LIBDIR" ; then +- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`/lib/pkgconfig +- fi +- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'` +- if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then +- AC_ARG_ENABLE(pc-files, +- [ --enable-pc-files generate and install .pc files for pkg-config], +- [enable_pc_files=$enableval], +- [enable_pc_files=no]) +- AC_MSG_RESULT($enable_pc_files) +- else +- AC_MSG_RESULT(no) +- AC_MSG_WARN(did not find library $PKG_CONFIG_LIBDIR) +- enable_pc_files=no +- fi +-fi +-AC_SUBST(PKG_CONFIG_LIBDIR) ++CF_WITH_PKG_CONFIG_LIBDIR ++CF_ENABLE_PC_FILES + + AC_MSG_CHECKING(if you want to build test-programs) + AC_ARG_WITH(tests, +@@ -186,9 +166,7 @@ + + CF_NCURSES_ADDON + +-CF_LIB_PREFIX(cf_prefix) +-LIB_PREFIX=$cf_prefix +-AC_SUBST(LIB_PREFIX) ++CF_WITH_LIB_PREFIX(cf_prefix) + + LIB_SUFFIX= + AC_SUBST(LIB_SUFFIX) +@@ -235,8 +213,6 @@ + ############################################################################### + CF_HELP_MESSAGE(Fine-Tuning Your Configuration:) + +-CF_PATHSEP +- + ### use option --enable-broken-linker to force on use of broken-linker support + AC_MSG_CHECKING(if you want broken-linker support code) + AC_ARG_ENABLE(broken_linker, +@@ -394,18 +370,7 @@ + CF_HELP_MESSAGE(Testing/development Options:) + + ### use option --disable-echo to suppress full display compiling commands +-AC_MSG_CHECKING(if you want to display full commands during build) +-AC_ARG_ENABLE(echo, +- [ --enable-echo build: display "compiling" commands (default)], +- [with_echo=$enableval], +- [with_echo=yes]) +-if test "$with_echo" = yes; then +- ECHO_LINK= +-else +- ECHO_LINK='@ echo linking $@ ... ;' +-fi +-AC_MSG_RESULT($with_echo) +-AC_SUBST(ECHO_LINK) ++CF_DISABLE_ECHO + + ### use option --enable-warnings to turn on all gcc warnings + AC_MSG_CHECKING(if you want to see compiler warnings) +@@ -431,7 +396,6 @@ + then + if test "$with_assertions" = no + then +- AC_DEFINE(NDEBUG) + CPPFLAGS="$CPPFLAGS -DNDEBUG" + else + CF_ADD_ADAFLAGS(-gnata) +@@ -514,24 +478,13 @@ + fi + + CF_HELP_MESSAGE(Ada95 Binding Options:) +- ++cf_with_ada=yes + 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 +- +- # make ADAFLAGS consistent with CFLAGS +- case "$CFLAGS" in +- *-g*) +- CF_ADD_ADAFLAGS(-g) +- ;; +- esac +- case "$CFLAGS" in +- *-O*) +- CF_ADD_ADAFLAGS(-O3) +- ;; +- esac ++ CF_FIXUP_ADAFLAGS + + CF_GNAT_GENERICS + CF_GNAT_SIGINT +@@ -556,8 +509,10 @@ + ################################################################################ + + # not needed +-TINFO_ARGS2= +-AC_SUBST(TINFO_ARGS2) ++TINFO_LDFLAGS2= ++AC_SUBST(TINFO_LDFLAGS2) ++TINFO_LIBS= ++AC_SUBST(TINFO_LIBS) + + ### Construct the list of include-directories to be generated + CF_INCLUDE_DIRS +@@ -656,8 +611,8 @@ + AWK="$AWK" + DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX" + DFT_LWR_MODEL="$DFT_LWR_MODEL" +-ECHO_LINK="$ECHO_LINK" + LIB_NAME="$LIB_NAME" ++LIB_PREFIX="$LIB_PREFIX" + LIB_SUFFIX="$LIB_SUFFIX" + LN_S="$LN_S" + NCURSES_MAJOR="$NCURSES_MAJOR" +diff -Naur ncurses-5.9.orig/Ada95/doc/Makefile.in ncurses-5.9/Ada95/doc/Makefile.in +--- ncurses-5.9.orig/Ada95/doc/Makefile.in 2012-08-25 19:57:59.376567724 +0000 ++++ ncurses-5.9/Ada95/doc/Makefile.in 2012-08-25 19:58:02.286553964 +0000 +@@ -1,4 +1,4 @@ +-# $Id: Makefile.in,v 1.2 2011/03/26 19:26:17 tom Exp $ ++# $Id: Makefile.in,v 1.3 2012/08/11 21:31:56 tom Exp $ + ############################################################################## + # Copyright (c) 2011 Free Software Foundation, Inc. # + # # +@@ -38,6 +38,7 @@ + srcdir = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ ++datarootdir = @datarootdir@ + datadir = @datadir@ + mandir = @mandir@ + +diff -Naur ncurses-5.9.orig/Ada95/gen/Makefile.in ncurses-5.9/Ada95/gen/Makefile.in +--- ncurses-5.9.orig/Ada95/gen/Makefile.in 2012-08-25 19:57:59.379901042 +0000 ++++ ncurses-5.9/Ada95/gen/Makefile.in 2012-08-25 19:58:01.003226698 +0000 +@@ -1,5 +1,5 @@ + ############################################################################## +-# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -28,7 +28,7 @@ + # + # Author: Juergen Pfeifer, 1996 + # +-# $Id: Makefile.in,v 1.74 2011/03/26 23:36:30 tom Exp $ ++# $Id: Makefile.in,v 1.76 2012/03/17 16:45:38 tom Exp $ + # + .SUFFIXES: + +@@ -73,7 +73,7 @@ + LOCAL_LIBDIR = @top_builddir@/lib + + LINK = $(HOST_CC) +-LD_FLAGS = @LD_MODEL@ $(LOCAL_LIBS) @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) @TINFO_ARGS2@ ++LD_FLAGS = @LD_MODEL@ $(LOCAL_LIBS) @TINFO_LDFLAGS2@ @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) @TINFO_LIBS@ + + RANLIB = @RANLIB@ + +@@ -179,7 +179,7 @@ + -rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG) + + $(PROG_GENERATE): gen.o +- @ECHO_LINK@ $(LINK) $(CFLAGS_NORMAL) gen.o $(LD_FLAGS) -o $@ ++ @ECHO_LD@ $(LINK) $(CFLAGS_NORMAL) gen.o $(LD_FLAGS) -o $@ + + gen.o: $(srcdir)/gen.c + $(HOST_CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/gen.c +@@ -411,7 +411,7 @@ + @mkdir -p $(HTML_DIR) + cp -p ../src/*.ad[sb] . && chmod +w *.ad[sb] + @USE_OLD_MAKERULES@ ln -sf ../src/*.ali . +-@USE_GNAT_PROJECTS@ ln -sf ../static-ali/*.ali . ++@USE_GNAT_PROJECTS@ ln -sf ../static-ali/*.ali . + @echo "Filtering generated files" + @for f in $(GEN_SRC); do \ + h=`basename $$f` ;\ +diff -Naur ncurses-5.9.orig/Ada95/gen/gen.c ncurses-5.9/Ada95/gen/gen.c +--- ncurses-5.9.orig/Ada95/gen/gen.c 2012-08-25 19:57:59.379901042 +0000 ++++ ncurses-5.9/Ada95/gen/gen.c 2012-08-25 19:57:59.859898773 +0000 +@@ -32,7 +32,7 @@ + + /* + Version Control +- $Id: gen.c,v 1.59 2011/03/31 23:50:24 tom Exp $ ++ $Id: gen.c,v 1.60 2011/04/30 19:47:19 Nicolas.Boulenguez Exp $ + --------------------------------------------------------------------------*/ + /* + This program generates various record structures and constants from the +@@ -124,19 +124,15 @@ + int len, /* size of the record in bytes */ + int bias) + { +- const char *unused_name = "Unused"; +- int long_bits = (8 * (int)sizeof(unsigned long)); +- int len_bits = (8 * len); +- int i, j, n, l, cnt = 0, low, high; ++ const int len_bits = (8 * len); ++ int i, l, low, high; + int width = strlen(RES_NAME) + 3; + unsigned long a; +- unsigned long mask = 0; + + assert(nap != NULL); + + for (i = 0; nap[i].name != (char *)0; i++) + { +- cnt++; + l = (int)strlen(nap[i].name); + if (l > width) + width = l; +@@ -147,32 +143,8 @@ + printf(" record\n"); + for (i = 0; nap[i].name != (char *)0; i++) + { +- mask |= nap[i].attr; + printf(" %-*s : Boolean;\n", width, nap[i].name); + } +- +- /* +- * Compute a mask for the unused bits in this target. +- */ +- mask = ~mask; +- /* +- * Bits in the biased area are unused by the target. +- */ +- for (j = 0; j < bias; ++j) +- { +- mask &= (unsigned long)(~(1L << j)); +- } +- /* +- * Bits past the target's size are really unused. +- */ +- for (j = len_bits + bias; j < long_bits; ++j) +- { +- mask &= (unsigned long)(~(1L << j)); +- } +- if (mask != 0) +- { +- printf(" %-*s : Boolean;\n", width, unused_name); +- } + printf(" end record;\n"); + printf(" pragma Convention (C, %s);\n\n", name); + +@@ -187,17 +159,10 @@ + printf(" %-*s at 0 range %2d .. %2d;\n", width, nap[i].name, + low - bias, high - bias); + } +- if (mask != 0) +- { +- l = find_pos((char *)&mask, sizeof(mask), &low, &high); +- if (l >= 0) +- printf(" %-*s at 0 range %2d .. %2d;\n", width, unused_name, +- low - bias, high - bias); +- } +- i = 1; +- n = cnt; + printf(" end record;\n"); ++ printf(" pragma Warnings (Off);"); + printf(" for %s'Size use %d;\n", name, len_bits); ++ printf(" pragma Warnings (On);\n"); + printf(" -- Please note: this rep. clause is generated and may be\n"); + printf(" -- different on your system."); + } +diff -Naur ncurses-5.9.orig/Ada95/samples/Makefile.in ncurses-5.9/Ada95/samples/Makefile.in +--- ncurses-5.9.orig/Ada95/samples/Makefile.in 2012-08-25 19:57:59.376567724 +0000 ++++ ncurses-5.9/Ada95/samples/Makefile.in 2012-08-25 19:58:02.286553964 +0000 +@@ -28,7 +28,7 @@ + # + # Author: Juergen Pfeifer, 1996 + # +-# $Id: Makefile.in,v 1.46 2011/03/28 23:45:08 tom Exp $ ++# $Id: Makefile.in,v 1.47 2012/08/11 21:31:56 tom Exp $ + # + .SUFFIXES: + +@@ -42,6 +42,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ ++datarootdir = @datarootdir@ + datadir = @datadir@ + libdir = @libdir@ + includedir = @includedir@ +diff -Naur ncurses-5.9.orig/Ada95/src/Makefile.in ncurses-5.9/Ada95/src/Makefile.in +--- ncurses-5.9.orig/Ada95/src/Makefile.in 2012-08-25 19:57:59.383234360 +0000 ++++ ncurses-5.9/Ada95/src/Makefile.in 2012-08-25 19:57:59.859898773 +0000 +@@ -28,7 +28,7 @@ + # + # Author: Juergen Pfeifer, 1996 + # +-# $Id: Makefile.in,v 1.60 2011/03/31 09:46:16 tom Exp $ ++# $Id: Makefile.in,v 1.62 2011/04/30 22:24:45 tom Exp $ + # + .SUFFIXES: + +@@ -218,7 +218,9 @@ + $(ADAPREP) -DADA_TRACE=@ADA_TRACE@ -DPRAGMA_UNREF=@PRAGMA_UNREF@ $(srcdir)/$(ABASE)-trace.adb_p $@ + + ############################################################################### +-C_OBJS = c_varargs_to_ada.o ncurses_compat.o ++# Use these definitions when building a shared library. ++SHARED_C_OBJS = c_varargs_to_ada.o ncurses_compat.o ++SHARED_OBJS = $(SHARED_C_OBJS) @USE_OLD_MAKERULES@$(LIBOBJS) @cf_generic_objects@ + + c_varargs_to_ada.o : $(srcdir)/c_varargs_to_ada.c + $(CC) $(CFLAGS_DEFAULT) -c -o $@ $(srcdir)/c_varargs_to_ada.c +@@ -227,13 +229,22 @@ + $(CC) $(CFLAGS_DEFAULT) -c -o $@ $(srcdir)/ncurses_compat.c + + ############################################################################### ++# Use these definitions when building a static library. ++STATIC_C_OBJS = static_c_varargs_to_ada.o static_ncurses_compat.o ++STATIC_OBJS = $(STATIC_C_OBJS) @USE_OLD_MAKERULES@$(LIBOBJS) @cf_generic_objects@ + +-MIXED_OBJS = $(C_OBJS) @USE_OLD_MAKERULES@$(LIBOBJS) @cf_generic_objects@ ++static_c_varargs_to_ada.o : $(srcdir)/c_varargs_to_ada.c ++ $(CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/c_varargs_to_ada.c ++ ++static_ncurses_compat.o : $(srcdir)/ncurses_compat.c ++ $(CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/ncurses_compat.c ++ ++############################################################################### + + @USE_OLD_MAKERULES@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \ + @USE_OLD_MAKERULES@ $(BUILD_DIR_LIB) \ +-@USE_OLD_MAKERULES@ $(MIXED_OBJS) +-@USE_OLD_MAKERULES@ $(AR) $(ARFLAGS) $@ $(MIXED_OBJS) ++@USE_OLD_MAKERULES@ $(STATIC_OBJS) ++@USE_OLD_MAKERULES@ $(AR) $(ARFLAGS) $@ $(STATIC_OBJS) + + $(BUILD_DIR)/static-ali : ; mkdir -p $@ + $(BUILD_DIR)/static-obj : ; mkdir -p $@ +@@ -245,10 +256,10 @@ + + @USE_GNAT_PROJECTS@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \ + @USE_GNAT_PROJECTS@ $(ABASE)-trace.adb \ +-@USE_GNAT_PROJECTS@ $(C_OBJS) \ ++@USE_GNAT_PROJECTS@ $(STATIC_C_OBJS) \ + @USE_GNAT_PROJECTS@ $(STATIC_DIRS) + @USE_GNAT_PROJECTS@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static +-@USE_GNAT_PROJECTS@ $(AR) $(ARFLAGS) $@ $(C_OBJS) ++@USE_GNAT_PROJECTS@ $(AR) $(ARFLAGS) $@ $(STATIC_C_OBJS) + @USE_GNAT_PROJECTS@ + @USE_GNAT_LIBRARIES@install \ + @USE_GNAT_LIBRARIES@install.libs :: \ +@@ -274,8 +285,11 @@ + $(BUILD_DIR)/dynamic-obj + + @MAKE_ADA_SHAREDLIB@all :: $(BUILD_DIR_LIB)/$(SHARED_LIBNAME) +-@MAKE_ADA_SHAREDLIB@$(BUILD_DIR_LIB)/$(SHARED_LIBNAME) :: $(ABASE)-trace.adb $(SHARED_DIRS) +-@MAKE_ADA_SHAREDLIB@ cp $(MIXED_OBJS) $(BUILD_DIR)/dynamic-obj/ ++@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@ cp $(SHARED_OBJS) $(BUILD_DIR)/dynamic-obj/ + @MAKE_ADA_SHAREDLIB@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic + + install \ +diff -Naur ncurses-5.9.orig/INSTALL ncurses-5.9/INSTALL +--- ncurses-5.9.orig/INSTALL 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/INSTALL 2012-08-25 19:58:02.289887281 +0000 +@@ -1,5 +1,5 @@ + ------------------------------------------------------------------------------- +--- Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. -- ++-- Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. -- + -- -- + -- Permission is hereby granted, free of charge, to any person obtaining a -- + -- copy of this software and associated documentation files (the -- +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: INSTALL,v 1.155 2011/03/31 08:27:24 tom Exp $ ++-- $Id: INSTALL,v 1.166 2012/08/11 20:12:34 tom Exp $ + --------------------------------------------------------------------- + How to install Ncurses/Terminfo on your system + --------------------------------------------------------------------- +@@ -407,13 +407,14 @@ + + --disable-tic-depends + When building shared libraries, normally the tic library is linked to +- depend upon the ncurses library (and in turn, on the term-library if +- the --with-termlib option was given). The tic- and term-libraries +- ABI does not depend on the --enable-widec option. Some packagers have +- used this to reduce the number of library files which are packaged +- by using only one copy of those libraries. To make this work properly, ++ depend upon the ncurses library (or equivalently, on the tinfo-library ++ if the --with-termlib option was given). The tic- and tinfo-library ++ ABIs do not depend on the --enable-widec option. Some packagers have ++ used this to reduce the number of library files which are packaged by ++ using only one copy of those libraries. To make this work properly, + the tic library must be built without an explicit dependency on the +- ncurses (or ncursesw) library. Use this configure option to do that. ++ underlying library (ncurses vs ncursesw, tinfo vs tinfow). Use this ++ configure option to do that. + For example + configure --with-ticlib --with-shared --disable-tic-depends + +@@ -555,6 +556,9 @@ + library by reducing global and static variables. This option is also + set if --with-pthread is used. + ++ Enabling this option adds a "t" to the library names, except for the ++ special case when --enable-weak-symbols is also used. ++ + --enable-rpath + Use rpath option when generating shared libraries, and (with some + restrictions) when linking the corresponding programs. This originally +@@ -595,6 +599,14 @@ + reducing the need for juggling the global SP value with set_term() and + delscreen(). + ++ --enable-string-hacks ++ Controls whether strlcat and strlcpy may be used. The same issue ++ applies to OpenBSD's warnings about snprintf, noting that this function ++ is weakly standardized. ++ ++ Aside from stifling these warnings, there is no functional improvement ++ in ncurses. ++ + --enable-symlinks + If your system supports symbolic links, make tic use symbolic links + rather than hard links to save diskspace when writing aliases in the +@@ -616,6 +628,12 @@ + match is found in the terminfo database. See also the --enable-getcap + and --enable-getcap-cache options. + ++ Termcap support requires run-time parsing rather than loading ++ predigested data. If you have specified --with-ticlib, then you ++ cannot have termcap support since run-time parsing is done in the ++ tic library, which is intentionally not part of normal linkage ++ dependencies. ++ + --enable-warnings + Turn on GCC compiler warnings. There should be only a few. + +@@ -824,7 +842,17 @@ + NOTE: a few systems build shared libraries with fixed pathnames; this + option probably will not work for those configurations. + +- --with-libtool[=XXX] ++ --with-lib-prefix=XXX ++ OS/2 EMX used a different naming convention from most Unix-like ++ platforms. It required that the "lib" part of a library name was ++ omitted. Newer EMX as part of eComStation does not follow that ++ convention. Use this option to override the configure script's ++ assumptions about the library-prefix. If this option is omitted, it ++ uses the original OS/2 EMX convention for that platform. Use ++ "--with-lib-prefix=lib" for the newer EMX in eComStation. Use ++ "--without-lib-prefix" to suppress it for other odd platforms. ++ ++ --with-libtool[=XXX] + Generate libraries with libtool. If this option is selected, then it + overrides all other library model specifications. Note that libtool + must already be installed, uses makefile rules dependent on GNU make, +@@ -904,6 +932,10 @@ + --with-pkg-config=[DIR] + Check for pkg-config, optionally specifying its path. + ++ --with-pkg-config-libdir=[DIR] ++ If pkg-config was found, override the automatic check for its library ++ path. ++ + --with-profile + Generate profile-libraries These are named by adding "_p" to the root, + e.g., libncurses_p.a +@@ -996,10 +1028,27 @@ + library dependencies for tic and other programs built with the tic + library. + ++ --with-tparm-arg[=XXX] ++ Override the type used for tparm() arguments, which normally is a ++ "long". However the function must assume that its arguments can hold a ++ pointer to char's which is not always workable for 64-bit platforms. A ++ better choice would be intptr_t, which was not available at the time ++ tparm's interface was defined. ++ ++ If the option is not given, this defaults to "long". ++ + --with-trace + Configure the trace() function as part of the all models of the ncurses + library. Normally it is part of the debug (libncurses_g) library only. + ++ --with-xterm-kbs=XXX ++ Configure xterm's terminfo entries to use either BS (^H, i.e., ASCII ++ backspace) or DEL (^?, or 127). XXX can be BS (or bs, 8) or DEL ++ (or del, 127). ++ ++ During installation, the makefile and scripts modifies the "xterm+kbs" ++ terminfo entry to use this setting. ++ + --with-valgrind + For testing, compile with debug option. + This also sets the --disable-leaks option. +@@ -1024,6 +1073,8 @@ + install as "ncurses.h" and modify the installed headers and manpages + accordingly. + ++ Likewise, do not install an alias "curses" for the ncurses manpage. ++ + --without-cxx + XSI curses declares "bool" as part of the interface. C++ also declares + "bool". Neither specifies the size and type of booleans, but both +@@ -1726,20 +1777,37 @@ + By default, there are no entries on the fallback list. After you have + built the ncurses suite for the first time, you can change the list + (the process needs infocmp(1)). To do so, use the script +- ncurses/tinfo/MKfallback.sh. A configure script option ++ ncurses/tinfo/MKfallback.sh. The configure script option + --with-fallbacks does this (it accepts a comma-separated list of the + names you wish, and does not require a rebuild). + + If you wanted (say) to have linux, vt100, and xterm fallbacks, you +- would use the commands ++ might use the commands + + cd ncurses; +- tinfo/MKfallback.sh linux vt100 xterm >fallback.c ++ tinfo/MKfallback.sh \ ++ $TERMINFO \ ++ ../misc/terminfo.src \ ++ `which tic` \ ++ linux vt100 xterm >fallback.c ++ ++ The first three parameters of the script are normally supplied by ++ the configured makefiles via the "--with-fallbacks" option. They ++ are ++ ++ 1) the location of the terminfo database ++ 2) the source for the terminfo entries ++ 3) the location of the tic program, used to create a terminfo ++ database. + + Then just rebuild and reinstall the library as you would normally. + You can restore the default empty fallback list with + +- tinfo/MKfallback.sh >fallback.c ++ tinfo/MKfallback.sh \ ++ $TERMINFO \ ++ ../misc/terminfo.src \ ++ `which tic` \ ++ >fallback.c + + The overhead for an empty fallback list is one trivial stub function. + Any non-empty fallback list is const-ed and therefore lives in sharable +diff -Naur ncurses-5.9.orig/MANIFEST ncurses-5.9/MANIFEST +--- ncurses-5.9.orig/MANIFEST 2012-08-25 19:57:59.429900806 +0000 ++++ ncurses-5.9/MANIFEST 2012-08-25 19:58:01.833222773 +0000 +@@ -545,6 +545,8 @@ + ./include/nc_alloc.h + ./include/nc_mingw.h + ./include/nc_panel.h ++./include/nc_string.h ++./include/nc_termios.h + ./include/nc_tparm.h + ./include/ncurses_cfg.hin + ./include/ncurses_defs +@@ -764,7 +766,6 @@ + ./mk-0th.awk + ./mk-1st.awk + ./mk-2nd.awk +-./mk-dlls.sh.in + ./mk-hdr.awk + ./ncurses/Makefile.in + ./ncurses/README +@@ -867,6 +868,12 @@ + ./ncurses/llib-lncursest + ./ncurses/llib-lncursestw + ./ncurses/llib-lncursesw ++./ncurses/llib-ltic ++./ncurses/llib-ltictw ++./ncurses/llib-lticw ++./ncurses/llib-ltinfo ++./ncurses/llib-ltinfotw ++./ncurses/llib-ltinfow + ./ncurses/modules + ./ncurses/tinfo/MKcaptab.awk + ./ncurses/tinfo/MKcaptab.sh +@@ -970,6 +977,14 @@ + ./ncurses/win32con/gettimeofday.c + ./ncurses/win32con/wcwidth.c + ./ncurses/win32con/win_driver.c ++./package/debian/changelog ++./package/debian/compat ++./package/debian/control ++./package/debian/copyright ++./package/debian/rules ++./package/debian/source/format ++./package/debian/watch ++./package/ncurses.spec + ./panel/Makefile.in + ./panel/headers + ./panel/llib-lpanel +@@ -1022,6 +1037,7 @@ + ./test/cardfile.dat + ./test/chgat.c + ./test/clip_printw.c ++./test/color_name.h + ./test/color_set.c + ./test/configure + ./test/configure.in +diff -Naur ncurses-5.9.orig/Makefile.in ncurses-5.9/Makefile.in +--- ncurses-5.9.orig/Makefile.in 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/Makefile.in 2012-08-25 19:58:02.289887281 +0000 +@@ -1,6 +1,6 @@ +-# $Id: Makefile.in,v 1.30 2010/11/27 21:45:27 tom Exp $ ++# $Id: Makefile.in,v 1.34 2012/08/11 21:41:19 tom Exp $ + ############################################################################## +-# Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -35,7 +35,8 @@ + VPATH = @srcdir@ + + DESTDIR=@DESTDIR@ +-CF_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" ++RPATH_LIST=@RPATH_LIST@ ++CF_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)" + + @SET_MAKE@ + +@@ -48,6 +49,7 @@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ ++datarootdir = @datarootdir@ + + bindir = @bindir@ + ticdir = @TERMINFO@ +@@ -87,12 +89,9 @@ + fgrep NCURSES_VERSION $(includedir)/curses.h >/dev/null || \ + echo '** Will overwrite non-ncurses curses.h' + +-dlls: libs +- $(SHELL) $(srcdir)/mk-dlls.sh +- + distclean \ + realclean :: +- -rm -f mk-dlls.sh mingw_arch ++ + + # Put the common rules here so that we can easily construct the list of + # directories to visit. +diff -Naur ncurses-5.9.orig/NEWS ncurses-5.9/NEWS +--- ncurses-5.9.orig/NEWS 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/NEWS 2012-08-25 19:58:02.303220551 +0000 +@@ -1,5 +1,5 @@ + ------------------------------------------------------------------------------- +--- Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. -- ++-- Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. -- + -- -- + -- Permission is hereby granted, free of charge, to any person obtaining a -- + -- copy of this software and associated documentation files (the -- +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.1682 2011/04/04 00:02:42 tom Exp $ ++-- $Id: NEWS,v 1.1942 2012/08/11 21:30:05 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -45,6 +45,731 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20120811 ++ + update autoconf patch to 2.52.20120811, adding --datarootdir ++ (prompted by discussion with Erwin Waterlander). ++ + improve description of --enable-reentrant option in README and the ++ INSTALL file. ++ + add nsterm-256color, make this the default nsterm -TD ++ + remove bw from nsterm-bce, per testing with tack -TD ++ ++20120804 ++ + update test/configure, adding check for tinfo library. ++ + improve limit-checks for the getch fifo (report by Werner Fink). ++ + fix a remaining mismatch between $with_echo and the symbols updated ++ by CF_DISABLE_ECHO affecting parameters for mk-2nd.awk (report by ++ Sven Joachim, cf: 20120317). ++ + modify followup check for pkg-config's library directory in the ++ --enable-pc-files option to validate syntax (report by Sven Joachim, ++ cf: 20110716). ++ ++20120728 ++ + correct path for ncurses_mingw.h in include/headers, in case build ++ is done outside source-tree (patch by Roumen Petrov). ++ + modify some older xterm entries to align with xterm source -TD ++ + separate "xterm-old" alias from "xterm-r6" -TD ++ + add E3 extended capability to xterm-basic and putty -TD ++ + parenthesize parameters of other macros in curses.h -TD ++ + parenthesize parameter of COLOR_PAIR and PAIR_NUMBER in curses.h ++ in case it happens to be a comma-expression, etc. (patch by Nick ++ Black). ++ ++20120721 ++ + improved form_request_by_name() and menu_request_by_name(). ++ + eliminate two fixed-size buffers in toe.c ++ + extend use_tioctl() to have expected behavior when use_env(FALSE) and ++ use_tioctl(TRUE) are called. ++ + modify ncurses test-program, adding -E and -T options to demonstrate ++ use_env() versus use_tioctl(). ++ ++20120714 ++ + add use_tioctl() function (adapted from patch by Werner Fink, ++ Novell #769788): ++ ++20120707 ++ + add ncurses_mingw.h to installed headers (prompted by patch by ++ Juergen Pfeifer). ++ + clarify return-codes from wgetch() in response to SIGWINCH (prompted ++ by Novell #769788). ++ + modify resizeterm() to always push a KEY_RESIZE onto the fifo, even ++ if screensize is unchanged. Modify _nc_update_screensize() to push a ++ KEY_RESIZE if there was a SIGWINCH, even if it does not call ++ resizeterm(). These changes eliminate the case where a SIGWINCH is ++ received, but ERR returned from wgetch or wgetnstr because the screen ++ dimensions did not change (Novell #769788). ++ ++20120630 ++ + add --enable-interop to sample package scripts (suggested by Juergen ++ Pfeifer). ++ + update CF_PATH_SYNTAX macro, from mawk changes. ++ + modify mk-0th.awk to allow for generating llib-ltic, etc., though ++ some work is needed on cproto to work with lib_gen.c to update ++ llib-lncurses. ++ + remove redundant getenv() cal in database-iterator leftover from ++ cleanup in 20120622 changes (report by Sven Joachim). ++ ++20120622 ++ + add -d, -e and -q options to test/demo_terminfo and test/demo_termcap ++ + fix caching of environment variables in database-iterator (patch by ++ Philippe Troin, Redhat #831366). ++ ++20120616 ++ + add configure check to distinguish clang from gcc to eliminate ++ warnings about unused command-line parameters when compiler warnings ++ are enabled. ++ + improve behavior when updating terminfo entries which are hardlinked ++ by allowing for the possibility that an alias has been repurposed to ++ a new primary name. ++ + fix some strict compiler warnings based on package scripts. ++ + further fixes for configure check for working poll (Debian #676461). ++ ++20120608 ++ + fix an uninitialized variable in -c/-n logic for infocmp changes ++ (cf: 20120526). ++ + corrected fix for building c++ binding with clang 3.0 (report/patch ++ by Richard Yao, Gentoo #417613, cf: 20110409) ++ + correct configure check for working poll, fixing the case where stdin ++ is redirected, e.g., in rpm/dpkg builds (Debian #676461). ++ + add rpm- and dpkg-scripts, to test those build-environments. ++ The resulting packages are used only for testing. ++ ++20120602 ++ + add kdch1 aka "Remove" to vt220 and vt220-8 entries -TD ++ + add kdch1, etc., to qvt108 -TD ++ + add dl1/il1 to some entries based on dl/il values -TD ++ + add dl to simpleterm -TD ++ + add consistency-checks in tic for insert-line vs delete-line ++ controls, and insert/delete-char keys ++ + correct no-leaks logic in infocmp when doing comparisons, fixing ++ duplicate free of entries given via the command-line, and freeing ++ entries loaded from the last-but-one of files specified on the ++ command-line. ++ + add kdch1 to wsvt25 entry from NetBSD CVS (reported by David Lord, ++ analysis by Martin Husemann). ++ + add cnorm/civis to wsvt25 entry from NetBSD CVS (report/analysis by ++ Onno van der Linden). ++ ++20120526 ++ + extend -c and -n options of infocmp to allow comparing more than two ++ entries. ++ + correct check in infocmp for number of terminal names when more than ++ two are given. ++ + correct typo in curs_threads.3x (report by Yanhui Shen on ++ freebsd-hackers mailing list). ++ ++20120512 ++ + corrected 'op' for bterm (report by Samuel Thibault) -TD ++ + modify test/background.c to demonstrate a background character ++ holding a colored ACS_HLINE. The behavior differs from SVr4 due to ++ the thick- and double-line extension (cf: 20091003). ++ + modify handling of acs characters in PutAttrChar to avoid mapping an ++ unmapped character to a space with A_ALTCHARSET set. ++ + rewrite vt520 entry based on vt420 -TD ++ ++20120505 ++ + remove p6 (bold) from opus3n1+ for consistency -TD ++ + remove acs stuff from env230 per clues in Ingres termcap -TD ++ + modify env230 sgr/sgr0 to match other capabilities -TD ++ + modify smacs/rmacs in bq300-8 to match sgr/sgr0 -TD ++ + make sgr for dku7202 agree with other caps -TD ++ + make sgr for ibmpc agree with other caps -TD ++ + make sgr for tek4107 agree with other caps -TD ++ + make sgr for ndr9500 agree with other caps -TD ++ + make sgr for sco-ansi agree with other caps -TD ++ + make sgr for d410 agree with other caps -TD ++ + make sgr for d210 agree with other caps -TD ++ + make sgr for d470c, d470c-7b agree with other caps -TD ++ + remove redundant AC_DEFINE for NDEBUG versus Makefile definition. ++ + fix a back-link in _nc_delink_entry(), which is needed if ncurses is ++ configured with --enable-termcap and --disable-getcap. ++ ++20120428 ++ + fix some inconsistencies between vt320/vt420, e.g., cnorm/civis -TD ++ + add eslok flag to dec+sl -TD ++ + dec+sl applies to vt320 and up -TD ++ + drop wsl width from xterm+sl -TD ++ + reuse xterm+sl in putty and nsca-m -TD ++ + add ansi+tabs to vt520 -TD ++ + add ansi+enq to vt220-vt520 -TD ++ + fix a compiler warning in example in ncurses-intro.doc (Paul Waring). ++ + added paragraph in keyname manpage telling how extended capabilities ++ are interpreted as key definitions. ++ + modify tic's check of conflicting key definitions to include extended ++ capability strings in addition to the existing check on predefined ++ keys. ++ ++20120421 ++ + improve cleanup of temporary files in tic using atexit(). ++ + add msgr to vt420, similar DEC vtXXX entries -TD ++ + add several missing vt420 capabilities from vt220 -TD ++ + factor out ansi+pp from several entries -TD ++ + change xterm+sl and xterm+sl-twm to include only the status-line ++ capabilities and not "use=xterm", making them more generally useful ++ as building-blocks -TD ++ + add dec+sl building block, as example -TD ++ ++20120414 ++ + add XT to some terminfo entries to improve usefulness for other ++ applications than screen, which would like to pretend that xterm's ++ title is a status-line. -TD ++ + change use-clauses in ansi-mtabs, hp2626, and hp2622 based on review ++ of ordering and overrides -TD ++ + add consistency check in tic for screen's "XT" capability. ++ + add section in terminfo.src summarizing the user-defined capabilities ++ used in that file -TD ++ ++20120407 ++ + fix an inconsistency between tic/infocmp "-x" option; tic omits all ++ non-standard capabilities, while infocmp was ignoring only the user ++ definable capabilities. ++ + improve special case in tic parsing of description to allow it to be ++ followed by terminfo capabilities. Previously the description had to ++ be the last field on an input line to allow tic to distinguish ++ between termcap and terminfo format while still allowing commas to be ++ embedded in the description. ++ + correct variable name in gen_edit.sh which broke configurability of ++ the --with-xterm-kbs option. ++ + revert 2011-07-16 change to "linux" alias, return to "linux2.2" -TD ++ + further amend 20110910 change, providing for configure-script ++ override of the "linux" terminfo entry to install and changing the ++ default for that to "linux2.2" (Debian #665959). ++ ++20120331 ++ + update Ada95/configure to use CF_DISABLE_ECHO (cf: 20120317). ++ + correct order of use-clauses in st-256color -TD ++ + modify configure script to look for gnatgcc if the Ada95 binding ++ is built, in preference to the default gcc/cc (suggested by ++ Nicolas Boulenguez). ++ + modify configure script to ensure that the same -On option used for ++ the C compiler in CFLAGS is used for ADAFLAGS rather than simply ++ using "-O3" (suggested by Nicolas Boulenguez) ++ ++20120324 ++ + amend an old fix so that next_char() exits properly for empty files, ++ e.g., from reading /dev/null (cf: 20080804). ++ + modify tic so that it can read from the standard input, or from ++ a character device. Because tic uses seek's, this requires writing ++ the data to a temporary file first (prompted by remark by Sven ++ Joachim) (cf: 20000923). ++ ++20120317 ++ + correct a check made in lib_napms.c, so that terminfo applications ++ can again use napms() (cf: 20110604). ++ + add a note in tic.h regarding required casts for ABSENT_BOOLEAN ++ (cf: 20040327). ++ + correct scripting for --disable-echo option in test/configure. ++ + amend check for missing c++ compiler to work when no error is ++ reported, and no variables set (cf: 20021206). ++ + add/use configure macro CF_DISABLE_ECHO. ++ ++20120310 ++ + fix some strict compiler warnings for abi6 and 64-bits. ++ + use begin_va_copy/end_va_copy macros in lib_printw.c (cf: 20120303). ++ + improve a limit-check in infocmp.c (Werner Fink): ++ ++20120303 ++ + minor tidying of terminfo.tail, clarify reason for limitation ++ regarding mapping of \0 to \200 ++ + minor improvement to _nc_copy_termtype(), using memcpy to replace ++ loops. ++ + fix no-leaks checking in test/demo_termcap.c to account for multiple ++ calls to setupterm(). ++ + modified the libgpm change to show previous load as a problem in the ++ debug-trace. ++ > merge some patches from OpenSUSE rpm (Werner Fink): ++ + ncurses-5.7-printw.dif, fixes for varargs handling in lib_printw.c ++ + ncurses-5.7-gpm.dif, do not dlopen libgpm if already loaded by ++ runtime linker ++ + ncurses-5.6-fallback.dif, do not free arrays and strings from static ++ fallback entries ++ ++20120228 ++ + fix breakage in tic/infocmp from 20120225 (report by Werner Fink). ++ ++20120225 ++ + modify configure script to allow creating dll's for MinGW when ++ cross-compiling. ++ + add --enable-string-hacks option to control whether strlcat and ++ strlcpy may be used. The same issue applies to OpenBSD's warnings ++ about snprintf, noting that this function is weakly standardized. ++ + add configure checks for strlcat, strlcpy and snprintf, to help ++ reduce bogus warnings with OpenBSD builds. ++ + build-fix for OpenBSD 4.9 to supply consistent intptr_t declaration ++ (cf:20111231) ++ + update config.guess, config.sub ++ ++20120218 ++ + correct CF_ETIP_DEFINES configure macro, making it exit properly on ++ the first success (patch by Pierre Labastie). ++ + improve configure macro CF_MKSTEMP by moving existence-check for ++ mkstemp out of the AC_TRY_RUN, to help with cross-compiles. ++ + improve configure macro CF_FUNC_POLL from luit changes to detect ++ broken implementations, e.g., with Mac OS X. ++ + add configure option --with-tparm-arg ++ + build-fix for MinGW cross-compiling, so that make_hash does not ++ depend on TTY definition (cf: 20111008). ++ ++20120211 ++ + make sgr for xterm-pcolor agree with other caps -TD ++ + make sgr for att5425 agree with other caps -TD ++ + make sgr for att630 agree with other caps -TD ++ + make sgr for linux entries agree with other caps -TD ++ + make sgr for tvi9065 agree with other caps -TD ++ + make sgr for ncr260vt200an agree with other caps -TD ++ + make sgr for ncr160vt100pp agree with other caps -TD ++ + make sgr for ncr260vt300an agree with other caps -TD ++ + make sgr for aaa-60-dec-rv, aaa+dec agree with other caps -TD ++ + make sgr for cygwin, cygwinDBG agree with other caps -TD ++ + add configure option --with-xterm-kbs to simplify configuration for ++ Linux versus most other systems. ++ ++20120204 ++ + improved tic -D option, avoid making target directory and provide ++ better diagnostics. ++ ++20120128 ++ + add mach-gnu (Debian #614316, patch by Samuel Thibault) ++ + add mach-gnu-color, tweaks to mach-gnu terminfo -TD ++ + make sgr for sun-color agree with smso -TD ++ + make sgr for prism9 agree with other caps -TD ++ + make sgr for icl6404 agree with other caps -TD ++ + make sgr for ofcons agree with other caps -TD ++ + make sgr for att5410v1, att4415, att620 agree with other caps -TD ++ + make sgr for aaa-unk, aaa-rv agree with other caps -TD ++ + make sgr for avt-ns agree with other caps -TD ++ + amend fix intended to separate fixups for acsc to allow "tic -cv" to ++ give verbose warnings (cf: 20110730). ++ + modify misc/gen-edit.sh to make the location of the tabset directory ++ consistent with misc/Makefile.in, i.e., using ${datadir}/tabset ++ (Debian #653435, patch by Sven Joachim). ++ ++20120121 ++ + add --with-lib-prefix option to allow configuring for old/new flavors ++ of OS/2 EMX. ++ + modify check for gnat version to allow for year, as used in FreeBSD ++ port. ++ + modify check_existence() in db_iterator.c to simply check if the ++ path is a directory or file, according to the need. Checking for ++ directory size also gives no usable result with OS/2 (cf: 20120107). ++ + support OS/2 kLIBC (patch by KO Myung-Han). ++ ++20120114 ++ + several improvements to test/movewindow.c (prompted by discussion on ++ Linux Mint forum): ++ + modify movement commands to make them continuous ++ + rewrote the test for mvderwin ++ + rewrote the test for recursive mvwin ++ + split-out reusable CF_WITH_NCURSES_ETC macro in test/configure.in ++ + updated configure macro CF_XOPEN_SOURCE, build-fixes for Mac OS X ++ and OpenBSD. ++ + regenerated html manpages. ++ ++20120107 ++ + various improvments for MinGW (Juergen Pfeifer): ++ + modify stat() calls to ignore the st_size member ++ + drop mk-dlls.sh script. ++ + change recommended regular expression library. ++ + modify rain.c to allow for threaded configuraton. ++ + modify tset.c to allow for case when size-change logic is not used. ++ ++20111231 ++ + modify toe's report when -a and -s options are combined, to add ++ a column showing which entries belong to a given database. ++ + add -s option to toe, to sort its output. ++ + modify progs/toe.c, simplifying use of db-iterator results to use ++ caching improvements from 20111001 and 20111126. ++ + correct generation of pc-files when ticlib or termlib options are ++ given to rename the corresponding tic- or tinfo-libraries (report ++ by Sven Joachim). ++ ++20111224 ++ + document a portability issue with tput, i.e., that scripts which work ++ with ncurses may fail in other implementations that do no parameter ++ analysis. ++ + add putty-sco entry -TD ++ ++20111217 ++ + review/fix places in manpages where --program-prefix configure option ++ was not being used. ++ + add -D option to infocmp, to show the database locations that it ++ could use. ++ + fix build for the special case where term-driver, ticlib and termlib ++ are all enabled. The terminal driver depends on a few features in ++ the base ncurses library, so tic's dependencies include both ncurses ++ and termlib. ++ + fix build work for term-driver when --enable-wgetch-events option is ++ enabled. ++ + use types to fix some questionable casts to void*. ++ ++20111210 ++ + modify configure script to check if thread library provides ++ pthread_mutexattr_settype(), e.g., not provided by Solaris 2.6 ++ + modify configure script to suppress check to define _XOPEN_SOURCE ++ for IRIX64, since its header files have a conflict versus ++ _SGI_SOURCE. ++ + modify configure script to add ".pc" files for tic- and ++ tinfo-libraries, which were omitted in recent change (cf: 20111126). ++ + fix inconsistent checks on $PKG_CONFIG variable in configure script. ++ ++20111203 ++ + modify configure-check for etip.h dependencies, supplying a temporary ++ copy of ncurses_dll.h since it is a generated file (prompted by ++ Debian #646977). ++ + modify CF_CPP_PARAM_INIT "main" function to work with current C++. ++ ++20111126 ++ + correct database iterator's check for duplicate entries ++ (cf: 20111001). ++ + modify database iterator to ignore $TERMCAP when it is not an ++ absolute pathname. ++ + add -D option to tic, to show the database locations that it could ++ use. ++ + improve description of database locations in tic manpage. ++ + modify the configure script to generate a list of the ".pc" files to ++ generate, rather than deriving the list from the libraries which have ++ been built (patch by Mike Frysinger). ++ + use AC_CHECK_TOOLS in preference to AC_PATH_PROGS when searching for ++ ncurses*-config, e.g., in Ada95/configure and test/configure (adapted ++ from patch by Mike Frysinger). ++ ++20111119 ++ + remove obsolete/conflicting fallback definition for _POSIX_SOURCE ++ from curses.priv.h, fixing a regression with IRIX64 and Tru64 ++ (cf: 20110416) ++ + modify _nc_tic_dir() to ensure that its return-value is nonnull, ++ i.e., the database iterator was not initialized. This case is needed ++ to when tic is translating to termcap, rather than loading the ++ database (cf: 20111001). ++ ++20111112 ++ + add pccon entries for OpenBSD console (Alexei Malinin). ++ + build-fix for OpenBSD 4.9 with gcc 4.2.1, setting _XOPEN_SOURCE to ++ 600 to work around inconsistent ifdef'ing of wcstof between C and ++ C++ header files. ++ + modify capconvert script to accept more than exact match on "xterm", ++ e.g., the "xterm-*" variants, to exclude from the conversion (patch ++ by Robert Millan). ++ + add -lc_r as alternative for -lpthread, allows build of threaded code ++ in older FreeBSD machines. ++ + build-fix for MirBSD, which fails when either _XOPEN_SOURCE or ++ _POSIX_SOURCE are defined. ++ + fix a typo misc/Makefile.in, used in uninstalling pc-files. ++ ++20111030 ++ + modify make_db_path() to allow creating "terminfo.db" in the same ++ directory as an existing "terminfo" directory. This fixes a case ++ where switching between hashed/filesystem databases would cause the ++ new hashed database to be installed in the next best location - ++ root's home directory. ++ + add variable cf_cv_prog_gnat_correct to those passed to ++ config.status, fixing a problem with Ada95 builds (cf: 20111022). ++ + change feature test from _XPG5 to _XOPEN_SOURCE in two places, to ++ accommodate broken implementations for _XPG6. ++ + eliminate usage of NULL symbol from etip.h, to reduce header ++ interdependencies. ++ + add configure check to decide when to add _XOPEN_SOURCE define to ++ compiler options, i.e., for Solaris 10 and later (cf: 20100403). ++ This is a workaround for gcc 4.6, which fails to build the c++ ++ binding if that symbol is defined by the application, due to ++ incorrectly combining the corresponding feature test macros ++ (report by Peter Kruse). ++ ++20111022 ++ + correct logic for discarding mouse events, retaining the partial ++ events used to build up click, double-click, etc, until needed ++ (cf: 20110917). ++ + fix configure script to avoid creating unused Ada95 makefile when ++ gnat does not work. ++ + cleanup width-related gcc 3.4.3 warnings for 64-bit platform, for the ++ internal functions of libncurses. The external interface of courses ++ uses bool, which still produces these warnings. ++ ++20111015 ++ + improve description of --disable-tic-depends option to make it ++ clear that it may be useful whether or not the --with-termlib ++ option is also given (report by Sven Joachim). ++ + amend termcap equivalent for set_pglen_inch to use the X/Open ++ "YI" rather than the obsolete Solaris 2.5 "sL" (cf: 990109). ++ + improve manpage for tgetent differences from termcap library. ++ ++20111008 ++ + moved static data from db_iterator.c to lib_data.c ++ + modify db_iterator.c for memory-leak checking, fix one leak. ++ + modify misc/gen-pkgconfig.in to use Requires.private for the parts ++ of ncurses rather than Requires, as well as Libs.private for the ++ other library dependencies (prompted by Debian #644728). ++ ++20111001 ++ + modify tic "-K" option to only set the strict-flag rather than force ++ source-output. That allows the same flag to control the parser for ++ input and output of termcap source. ++ + modify _nc_getent() to ignore backslash at the end of a comment line, ++ making it consistent with ncurses' parser. ++ + restore a special-case check for directory needed to make termcap ++ text files load as if they were databases (cf: 20110924). ++ + modify tic's resolution/collision checking to attempt to remove the ++ conflicting alias from the second entry in the pair, which is ++ normally following in the source file. Also improved the warning ++ message to make it simpler to see which alias is the problem. ++ + improve performance of the database iterator by caching search-list. ++ ++20110925 ++ + add a missing "else" in changes to _nc_read_tic_entry(). ++ ++20110924 ++ + modify _nc_read_tic_entry() so that hashed-database is checked before ++ filesystem. ++ + updated CF_CURSES_LIBS check in test/configure script. ++ + modify configure script and makefiles to split TIC_ARGS and ++ TINFO_ARGS into pieces corresponding to LDFLAGS and LIBS variables, ++ to help separate searches for tic- and tinfo-libraries (patch by Nick ++ Alcock aka "Nix"). ++ + build-fix for lib_mouse.c changes (cf: 20110917). ++ ++20110917 ++ + fix compiler warning for clang 2.9 ++ + improve merging of mouse events (integrated patch by Damien ++ Guibouret). ++ + correct mask-check used in lib_mouse for wheel mouse buttons 4/5 ++ (patch by Damien Guibouret). ++ ++20110910 ++ + modify misc/gen_edit.sh to select a "linux" entry which works with ++ the current kernel rather than assuming it is always "linux3.0" ++ (cf: 20110716). ++ + revert a change to getmouse() which had the undesirable side-effect ++ of suppressing button-release events (report by Damien Guibouret, ++ cf: 20100102). ++ + add xterm+kbs fragment from xterm #272 -TD ++ + add configure option --with-pkg-config-libdir to provide control over ++ the actual directory into which pc-files are installed, do not use ++ the pkg-config environment variables (discussion with Frederic L W ++ Meunier). ++ + add link to mailing-list archive in announce.html.in, as done in ++ FAQ (prompted by question by Andrius Bentkus). ++ + improve manpage install by adjusting the "#include" examples to ++ show the ncurses-subdirectory used when --disable-overwrite option ++ is used. ++ + install an alias for "curses" to the ncurses manpage, tied to the ++ --with-curses-h configure option (suggested by Reuben Thomas). ++ ++20110903 ++ + propagate error-returns from wresize, i.e., the internal ++ increase_size and decrease_size functions through resize_term (report ++ by Tim van der Molen, cf: 20020713). ++ + fix typo in tset manpage (patch by Sven Joachim). ++ ++20110820 ++ + add a check to ensure that termcap files which might have "^?" do ++ not use the terminfo interpretation as "\177". ++ + minor cleanup of X-terminal emulator section of terminfo.src -TD ++ + add terminator entry -TD ++ + add simpleterm entry -TD ++ + improve wattr_get macros by ensuring that if the window pointer is ++ null, then the attribute and color values returned will be zero ++ (cf: 20110528). ++ ++20110813 ++ + add substitution for $RPATH_LIST to misc/ncurses-config.in ++ + improve performance of tic with hashed-database by caching the ++ database connection, using atexit() to cleanup. ++ + modify treatment of 2-character aliases at the beginning of termcap ++ entries so they are not counted in use-resolution, since these are ++ guaranteed to be unique. Also ignore these aliases when reporting ++ the primary name of the entry (cf: 20040501) ++ + double-check gn (generic) flag in terminal descriptions to ++ accommodate old/buggy termcap databases which misused that feature. ++ + minor fixes to _nc_tgetent(), ensure buffer is initialized even on ++ error-return. ++ ++20110807 ++ + improve rpath fix from 20110730 by ensuring that the new $RPATH_LIST ++ variable is defined in the makefiles which use it. ++ + build-fix for DragonFlyBSD's pkgsrc in test/configure script. ++ + build-fixes for NetBSD 5.1 with termcap support enabled. ++ + corrected k9 in dg460-ansi, add other features based on manuals -TD ++ + improve trimming of whitespace at the end of terminfo/termcap output ++ from tic/infocmp. ++ + when writing termcap source, ensure that colons in the description ++ field are translated to a non-delimiter, i.e., "=". ++ + add "-0" option to tic/infocmp, to make the termcap/terminfo source ++ use a single line. ++ + add a null-pointer check when handling the $CC variable. ++ ++20110730 ++ + modify configure script and makefiles in c++ and progs to allow the ++ directory used for rpath option to be overridden, e.g., to work ++ around updates to the variables used by tic during an install. ++ + add -K option to tic/infocmp, to provide stricter BSD-compatibility ++ for termcap output. ++ + add _nc_strict_bsd variable in tic library which controls the ++ "strict" BSD termcap compatibility from 20110723, plus these ++ features: ++ + allow escapes such as "\8" and "\9" when reading termcap ++ + disallow "\a", "\e", "\l", "\s" and "\:" escapes when reading ++ termcap files, passing through "a", "e", etc. ++ + expand "\:" as "\072" on output. ++ + modify _nc_get_token() to reset the token's string value in case ++ there is a string-typed token lacking the "=" marker. ++ + fix a few memory leaks in _nc_tgetent. ++ + fix a few places where reading from a termcap file could refer to ++ freed memory. ++ + add an overflow check when converting terminfo/termcap numeric ++ values, since terminfo stores those in a short, and they must be ++ positive. ++ + correct internal variables used for translating to termcap "%>" ++ feature, and translating from termcap %B to terminfo, needed by ++ tctest (cf: 19991211). ++ + amend a minor fix to acsc when loading a termcap file to separate it ++ from warnings needed for tic (cf: 20040710) ++ + modify logic in _nc_read_entry() and _nc_read_tic_entry() to allow ++ a termcap file to be handled via TERMINFO_DIRS. ++ + modify _nc_infotocap() to include non-mandatory padding when ++ translating to termcap. ++ + modify _nc_read_termcap_entry(), passing a flag in the case where ++ getcap is used, to reduce interactive warning messages. ++ ++20110723 ++ + add a check in start_color() to limit color-pairs to 256 when ++ extended colors are not supported (patch by David Benjamin). ++ + modify setcchar to omit no-longer-needed OR'ing of color pair in ++ the SetAttr() macro (patch by David Benjamin). ++ + add kich1 to sun terminfo entry (Yuri Pankov) ++ + use bold rather than reverse for smso in sun-color terminfo entry ++ (Yuri Pankov). ++ + improve generation of termcap using tic/infocmp -C option, e.g., ++ to correspond with 4.2BSD (prompted by discussion with Yuri Pankov ++ regarding Schilling's test program): ++ + translate %02 and %03 to %2 and %3 respectively. ++ + suppress string capabilities which use %s, not supported by tgoto ++ + use \040 rather than \s ++ + expand null characters as \200 rather than \0 ++ + modify configure script to support shared libraries for DragonFlyBSD. ++ ++20110716 ++ + replace an assert() in _nc_Free_Argument() with a regular null ++ pointer check (report/analysis by Franjo Ivancic). ++ + modify configure --enable-pc-files option to take into account the ++ PKG_CONFIG_PATH variable (report by Frederic L W Meunier). ++ + add/use xterm+tmux chunk from xterm #271 -TD ++ + resync xterm-new entry from xterm #271 -TD ++ + add E3 extended capability to linux-basic (Miroslav Lichvar) ++ + add linux2.2, linux2.6, linux3.0 entries to give context for E3 -TD ++ + add SI/SO change to linux2.6 entry (Debian #515609) -TD ++ + fix inconsistent tabset path in pcmw (Todd C. Miller). ++ + remove a backslash which continued comment, obscuring altos3 ++ definition with OpenBSD toolset (Nicholas Marriott). ++ ++20110702 ++ + add workaround from xterm #271 changes to ensure that compiler flags ++ are not used in the $CC variable. ++ + improve support for shared libraries, tested with AIX 5.3, 6.1 and ++ 7.1 with both gcc 4.2.4 and cc. ++ + modify configure checks for AIX to include release 7.x ++ + add loader flags/libraries to libtool options so that dynamic loading ++ works properly, adapted from ncurses-5.7-ldflags-with-libtool.patch ++ at gentoo prefix repository (patch by Michael Haubenwallner). ++ ++20110626 ++ + move include of nc_termios.h out of term_entry.h, since the latter ++ is installed, e.g., for tack while the former is not (report by ++ Sven Joachim). ++ ++20110625 ++ + improve cleanup() function in lib_tstp.c, using _exit() rather than ++ exit() and checking for SIGTERM rather than SIGQUIT (prompted by ++ comments forwarded by Nicholas Marriott). ++ + reduce name pollution from term.h, moving fallback #define's for ++ tcgetattr(), etc., to new private header nc_termios.h (report by ++ Sergio NNX). ++ + two minor fixes for tracing (patch by Vassili Courzakis). ++ + improve trace initialization by starting it in use_env() and ++ ripoffline(). ++ + review old email, add details for some changelog entries. ++ ++20110611 ++ + update minix entry to minix 3.2 (Thomas Cort). ++ + fix a strict compiler warning in change to wattr_get (cf: 20110528). ++ ++20110604 ++ + fixes for MirBSD port: ++ + set default prefix to /usr. ++ + add support for shared libraries in configure script. ++ + use S_ISREG and S_ISDIR consistently, with fallback definitions. ++ + add a few more checks based on ncurses/link_test. ++ + modify MKlib_gen.sh to handle sp-funcs renaming of NCURSES_OUTC type. ++ ++20110528 ++ + add case to CF_SHARED_OPTS for Interix (patch by Markus Duft). ++ + used ncurses/link_test to check for behavior when the terminal has ++ not been initialized and when an application passes null pointers ++ to the library. Added checks to cover this (prompted by Redhat ++ #707344). ++ + modify MKlib_gen.sh to make its main() function call each function ++ with zero parameters, to help find inconsistent checking for null ++ pointers, etc. ++ ++20110521 ++ + fix warnings from clang 2.7 "--analyze" ++ ++20110514 ++ + compiler-warning fixes in panel and progs. ++ + modify CF_PKG_CONFIG macro, from changes to tin -TD ++ + modify CF_CURSES_FUNCS configure macro, used in test directory ++ configure script: ++ + work around (non-optimizer) bug in gcc 4.2.1 which caused ++ test-expression to be omitted from executable. ++ + force the linker to see a link-time expression of a symbol, to ++ help work around weak-symbol issues. ++ ++20110507 ++ + update discussion of MKfallback.sh script in INSTALL; normally the ++ script is used automatically via the configured makefiles. However ++ there are still occasions when it might be used directly by packagers ++ (report by Gunter Schaffler). ++ + modify misc/ncurses-config.in to omit the "-L" option from the ++ "--libs" output if the library directory is /usr/lib. ++ + change order of tests for curses.h versus ncurses.h headers in the ++ configure scripts for Ada95 and test-directories, to look for ++ ncurses.h, from fixes to tin -TD ++ + modify ncurses/tinfo/access.c to account for Tandem's root uid ++ (report by Joachim Schmitz). ++ ++20110430 ++ + modify rules in Ada95/src/Makefile.in to ensure that the PIC option ++ is not used when building a static library (report by Nicolas ++ Boulenguez): ++ + Ada95 build-fix for big-endian architectures such as sparc. This ++ undoes one of the fixes from 20110319, which added an "Unused" member ++ to representation clauses, replacing that with pragmas to suppress ++ warnings about unused bits (patch by Nicolas Boulenguez): ++ ++20110423 ++ + add check in test/configure for use_window, use_screen. ++ + add configure-checks for getopt's variables, which may be declared ++ as different types on some Unix systems. ++ + add check in test/configure for some legacy curses types of the ++ function pointer passed to tputs(). ++ + modify init_pair() to accept -1's for color value after ++ assume_default_colors() has been called (Debian #337095). ++ + modify test/background.c, adding commmand-line options to demonstrate ++ assume_default_colors() and use_default_colors(). ++ ++20110416 ++ + modify configure script/source-code to only define _POSIX_SOURCE if ++ the checks for sigaction and/or termios fail, and if _POSIX_C_SOURCE ++ and _XOPEN_SOURCE are undefined (report by Valentin Ochs). ++ + update config.guess, config.sub ++ ++20110409 ++ + fixes to build c++ binding with clang 3.0 (patch by Alexander ++ Kolesen). ++ + add check for unctrl.h in test/configure, to work around breakage in ++ some ncurses packages. ++ + add "--disable-widec" option to test/configure script. ++ + add "--with-curses-colr" and "--with-curses-5lib" options to the ++ test/configure script to address testing with very old machines. ++ + 20110404 5.9 release for upload to ftp.gnu.org + + 20110402 +@@ -100,7 +825,7 @@ + + modify configure script to provide value for HTML_DIR in + Ada95/gen/Makefile.in, which depends on whether the Ada95 binding is + distributed separately (report by Nicolas Boulenguez). +- + modify configure script to add -g and/or -O3 to ADAFLAGS if the ++ + modify configure script to add "-g" and/or "-O3" to ADAFLAGS if the + CFLAGS for the build has these options. + + amend change from 20070324, to not add 1 to the result of getmaxx + and getmaxy in the Ada binding (report by Nicolas Boulenguez for +@@ -155,7 +880,7 @@ + 20110212 + + regenerated html manpages. + + use _tracef() in show_where() function of tic, to work correctly with +- special case of trace configuration. ++ special case of trace configuration. + + 20110205 + + add xterm-utf8 entry as a demo of the U8 feature -TD +@@ -219,7 +944,7 @@ + version which works with termcap. + + remove obsolete emacs "Local Variables" section from documentation + (request by Sven Joachim). +- + update doc/html/index.html to include NCURSES-Programming-HOWTO.html ++ + update doc/html/index.html to include NCURSES-Programming-HOWTO.html + (report by Sven Joachim). + + 20101128 +@@ -294,8 +1019,8 @@ + Sven Joachim). + + add parameterized cursor-controls to linux-basic (report by Dae) -TD + > patch by Juergen Pfeifer: +- + document how to build 32-bit libraries in README.MinGW +- + fixes to filename computation in mk-dlls.sh.in ++ + document how to build 32-bit libraries in README.MinGW ++ + fixes to filename computation in mk-dlls.sh.in + + use POSIX locale in mk-dlls.sh.in rather than en_US (report by Sven + Joachim). + + add a check in mk-dlls.sh.in to obtain the size of a pointer to +@@ -478,7 +1203,7 @@ + 20100417 + + modify _nc_capcmp() to work with cancelled strings. + + correct translation of "^" in _nc_infotocap(), used to transform +- terminfo to termcap strings ++ terminfo to termcap strings + + add configure --disable-rpath-hack, to allow disabling the feature + which adds rpath options for libraries in unusual places. + + improve CF_RPATH_HACK_2 by checking if the rpath option for a given +@@ -6530,7 +7255,7 @@ + handling in lynx (reported by Kim DeVaughn). + + 990306 pre-release +- + add -G option to tic and infocmp, to reverse the -g option. ++ + add -G option to tic and infocmp, to reverse the "-g" option. + + recode functions in name_match.c to avoid use of strncpy, which + caused a 4-fold slowdown in tic (cf: 980530). + + correct a few warnings about sign-extension in recent changes. +@@ -6901,7 +7626,7 @@ + since that is a little more efficient. + + minor correction to infocmp to avoid displaying "difference" between + two capabilities that are rendered in equivalent forms. +- + add -g option to tic/infocmp to force character constants to be ++ + add "-g" option to tic/infocmp to force character constants to be + displayed in quoted form. Otherwise their decimal values are shown. + + modify setupterm so that cancelled strings are treated the same as + absent strings, cancelled and absent booleans false (does not affect +@@ -8979,15 +9704,18 @@ + + correction to #317. + > patch 317 (ESR): + + re-add _nc_hash_map +- + modify EmitRange to maintain position as per original design. +- + add hashtest.c, program to time the hashmap optimization. ++ + modify EmitRange to maintain position as per original design ++ (patch by A. Lukyanov). ++ + modify test/ncurses.c and tputs, etc., to allow trace counting ++ output characters. ++ + add hashtest.c program to time the hashmap optimization. + > patch 316 (ESR): + + add logic to deal with magic-cookie (how was this tested?) + (lib_doupdate.c). + + add ncurses.c driver for magic-cookie, some fixes to ncurses.c + > patch 315 (ESR): +- + merged Alexander V Lukyanov's patch to use ech and rep - untested +- (lib_doupdate.c). ++ + merge changes to lib_doupdate.c to use ech and rep - untested ++ (patch by Alexander V Lukyanov). + + modified handling of interrupted system calls - untested + (lib_getch.c, lib_twait.c). + + new function _nc_mvcur_resume() +@@ -9059,12 +9787,12 @@ + + corrected typo in dtterm description. + > patch 313 (ESR): + + add dtterm description +- + clarify ncurses 'i' test (drop vscanf subtest) ++ + clarify ncurses 'i' test (drop mvwscanw subtest) + + 960810 - snapshot + + correct nl()/nonl() to work as per SVr4 & XSI. + + minor fixes to ncurses.c (use 'noraw()', mvscanw return-code) +- + refine configure-test for -g option (Tim Mooney). ++ + refine configure-test for "-g" option (Tim Mooney). + + correct interaction between O_BLANK and NEW_LINE request in form + library (Juergen Pfeifer) + +@@ -9073,7 +9801,8 @@ + > patch 312 (ESR): + correct terminfo.src corrupted by #310 + > patch 311 (ESR): +- + fix idlok() and idcok() and the default of the idlok switch. ++ + fix idlok() and idcok() and the default of the idlok switch (report ++ by Ville Sulko). + + 960803 - snapshot + + corrected tparm to handle capability strings without explicit pop +@@ -9083,7 +9812,7 @@ + > patch 310 (ESR): + + documentation and prototyping errors for has_color, immedok and idcok + (reported by William P Setzer ) +- + updated qnx terminfo entry (by Michael Hunter) ++ + updated qnx terminfo entry (patch by Michael Hunter) + + 960730 + + eliminate quoted includes in ncurses subdirectory, ensure config.h +@@ -9095,7 +9824,7 @@ + + call cbreak() in initscr(), as per XSI & SVr4. + + turn off hardware echo in initscr() as per XSI & SVr4 + > patch 309 (ESR): +- + terminfo changes (9.3.10), from BRL ++ + terminfo changes (9.3.9), from BRL + + add more checks to terminfo parser. + + add more symbols to infocmp. + +@@ -9114,6 +9843,7 @@ + > patch 308 (ESR): + + terminfo changes (9.3.8) + + modified logic of error-reporting in terminfo parser ++ + fix option-processing bug in toe. + + 960713 - snapshot + + always check for since ISC needs it to declare +@@ -9122,9 +9852,19 @@ + by Juergen Pfeifer, Mike Long) + + add LOCAL_LDFLAGS2 symbol (Juergen Pfeifer) + + corrected prototype for delay_output() -- bump ABI to 3.2 +- + terminfo patches #306/307 (ESR). ++ + patch 307 (ESR): ++ + enable more translations of nonstandard caps, and document them. ++ + misc/terminfo.src update to 9.13.8 ++ + patch 306 (ESR): + + moved logic that filters out rmul and rmso from setupterm to newterm + where it is less likely to interfere with termcap applications. ++ + cosmetic fixes to test/ncurses.c ++ + modify open() call in ncurses/read_entry.c to use O_RDONLY symbol ++ rather than constant (report by mib). ++ + misc/terminfo.src sgr0 and acsc changes (report by Philippe De ++ Muyter). ++ + modify ncurses/comp_parse.c so that entries containing a "+" can ++ have missing rmcup vs smcup. + + 960707 + + rollback ESR's #305 change to terminfo.src (it breaks existing +@@ -9139,7 +9879,6 @@ + + make lib_vidattr.c more readable using macros. + + filter out rmul, rmso that conflict with sgr0 when reading terminal + descriptions. +- + added sanity-checking of various paired string attributes (ESR). + + work around autoconf bug, force $INSTALL to absolute path + (reported by Zeyd). + + modify man-page install for BSDI to install preformatted .0 files +@@ -9152,6 +9891,12 @@ + + disable scrollok during the ncurses 'p' test; if it is enabled the + stdscr will scroll when putting the box-corners in the lower-right + of the screen. ++ > patch 305 (ESR): ++ + added sanity-checking of various paired string attributes. ++ + misc/terminfo.src update to 9.13.7 (report by A. Lukyanov). ++ + modify man/Makefile.in to make terminfo.5 during normal build. ++ > patch 304 (ESR): ++ + corrected allocation-length for $HOME/.terminfo path. + + 960629 - snapshot + + check return code of _nc_mvcur_scrolln() in _nc_scroll_optimize() for +@@ -9234,6 +9979,7 @@ + + better fix for nvi refresh-bug (Rick Marshall) + + fix for bug in handling of interrupted keystroke waits, + (Werner Fleck). ++ + misc/ncurses-intro.html syntax fix (Kajiyama Tamito). + + 960601 - snapshot + + auto-configure man-page compression-format and renames for Debian. +@@ -9248,7 +9994,7 @@ + + enhancement to the control over the new PC-style soft key format. + allow caller now to select whether or not one wants to have + the index-line; see curs_slk.3x for documentation (Juergen Pfeifer). +- + typos, don't use inline with -g (Philippe De Muyter) ++ + typos, don't use inline with "-g" (Philippe De Muyter) + + fixes for menus & wattr-, slk-functions (Juergen Pfeifer) + + 960526 - snapshot +@@ -9263,6 +10009,9 @@ + + include sys/types.h in case stdlib.h does not declare size_t. + + fixes for makefile (Tim Mooney) + + fixes for menus & forms (Juergen Pfeifer) ++ > patch 302 (ESR): ++ + improve hash function (suggested by Alexander V Lukyanov). ++ + 9.13.4 update for terminfo.src + + 960518 - snapshot + + revised ncurses.c panner test, let pad abut all 4 sides of screen. +@@ -9275,6 +10024,8 @@ + confusion, and made this check for the /usr/lib/terminfo pre-existing + directory. + > patches 299-301 (ESR): ++ + html fixes (Phillippe de Muyter). ++ + fix typo in ncurses-intro.html (report by Fabrizio Polacco). + + added hashmap.c + + mods to tracing, especially for ACS chars. + + corrected off-by-one in IDCtransform. +@@ -9294,13 +10045,21 @@ + > patches 297, 298 (ESR): + + implement TERMINFO_DIRS, and -o option of tic + + added TRACE_IEVENT +- + removed boolean version of 'getm' +- + added lib_print.c (for Rick Marshall) +- + added has_key() ++ + fix REQ_TOGGLE_ITEM in menu/menu_driver.c; it could select but not ++ deselect. ++ + added lib_print.c (request by Rick Marshall). ++ + added has_key() (request by Juergen Pfeifer). ++ + do not issue clrtoeol or clrtobot if the relevant portion of the line ++ is already blank (analysis by Keith Bostic). ++ + add parentheses for parameters of COLOR_PAIR and PAIR_NUMBER macros ++ (analysis by Jurgen Eidt). ++ + update screen's notion of cursor position in endwin() (analysis by ++ Alexander Lukyanov). + + added 't' to ncurses.c test. + + moved delay_output() to lib_tputs.c + + removed tparam() (was added in 1.9.9, but conflicts with emacs and + is not part of X/Open Curses). ++ + removed boolean version of 'getm'. + + misc cursor & optimization fixes. + + 960504 - snapshot +@@ -9326,11 +10085,20 @@ + + make TIOCGWINSZ configure test less stringent, in case user + configures via terminal that cannot get screen size. + > patches 295, 296 (ESR): +- + new "-e" option of tic. +- + fix for "infocmp -e". +- + restore working-directory in read_termcap.c + + split lib_kernel.c, lib_setup.c and names.c in order to reduce + overhead for programs that use only termcap features. ++ + new "-e" and "-h" options of tic (request by Tony Nugent). ++ + fix bug in mandatory-delay logic in lib_tputs.c (report by Sven ++ Verdoolaege). ++ + fix for "infocmp -e" to emit correct initializers (reported by Manual ++ J Novoa III). ++ + restore working-directory in read_termcap.c (report by Kayvan ++ Sylvan). ++ + use "-h" option on Solaris when generating shared libraries on ++ Solaris 2.5 to record the library name in the file, for assisting ++ the loader (patch by Scott Kramer). ++ + undo patch #294 changes to form and menu libraries (request by ++ Juergen Pfeifer). + + 960418 - snapshot + + use autoconf 2.9 +@@ -9338,10 +10106,22 @@ + definitions via , modified macros in lib_raw.c to avoid + K&R-style substitution) + > patches 293, 294 (ESR): +- + mods to wgetch() in cooked mode +- + corrected askuser() logic in tset +- + correct interaction of endwin() with mouse processing ++ + rewrite wsyncup(), wsyncdown(), as well as small fixes to form and ++ menu libraries to fix echo-breakage introduced by 1.8.9, 1.9.9e ++ changes (patches by Juergen Pfeifer). ++ + fix compile under QNX 4.2 by defining ONLCR in lib_raw.c when ++ __QNX__ is defined (patch by Michael Hunter). ++ + modify setupterm() to match documentation for its return value, fix ++ newterm to work with this change (report by Emmet Lazich). ++ + add checks in getch() for error, return ERR as appropriate (report by ++ Emmet Lazich). ++ + mods to wgetch() in cooked mode (report by Pete Seebach). ++ + corrected askuser() logic in tset (patch by Remco Treffkorn). ++ + correct interaction of endwin() with mouse processing (report by ++ Michael Elkins). + + added trace support for TTY flags ++ + update terminfo.src to 9.13.1 ++ + FreeBSD console entries (patch by Andrew Chernov). + + 960406 + + fixes for NeXT, ISC and HPUX auto-configure +diff -Naur ncurses-5.9.orig/README ncurses-5.9/README +--- ncurses-5.9.orig/README 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/README 2012-08-25 19:58:02.303220551 +0000 +@@ -1,5 +1,5 @@ + ------------------------------------------------------------------------------- +--- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. -- ++-- Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. -- + -- -- + -- Permission is hereby granted, free of charge, to any person obtaining a -- + -- copy of this software and associated documentation files (the -- +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: README,v 1.23 2006/04/22 22:19:37 tom Exp $ ++-- $Id: README,v 1.25 2012/08/11 20:11:26 tom Exp $ + ------------------------------------------------------------------------------- + README file for the ncurses package + +@@ -78,6 +78,10 @@ + library interfaces are not binary-compatible with the non-wide-character + version. + ++If you configure using the --enable-reentrant option, a "t" is appended to the ++library names (e.g., libncursest.a) and the resulting libraries have a ++different binary interface which makes the ncurses interface more "opaque". ++ + The ncurses libraries implement the curses API. The panel, menu and forms + libraries implement clones of the SVr4 panel, menu and forms APIs. The source + code for these lives in the `ncurses', `panel', `menu', and `form' directories +@@ -122,8 +126,9 @@ + tic -- terminfo source to binary compiler + infocmp -- terminfo binary to source decompiler/comparator + clear -- emits clear-screen for current terminal ++ tabs -- set tabs on a terminal + tput -- shell-script access to terminal capabilities. +- toe -- table of entries utility ++ toe -- table of entries utility + tset -- terminal-initialization utility + + The first two (tic and infocmp) are used for manipulating terminfo +@@ -153,8 +158,10 @@ + configuration scripts, porting, mods to adhere to XSI Curses in the + areas of background color, terminal modes. Also memory leak testing, + the wresize, default colors and key definition extensions and numerous +- bug fixes (more than half of those enumerated in NEWS beginning with +- the internal release 1.8.9). ++ bug fixes -- more than half of those enumerated in NEWS beginning with ++ the internal release 1.8.9, see ++ ++ http://invisible-island.net/personal/changelogs.html + + Florian La Roche (official maintainer for FSF's ncurses 4.2) + Beginning with release 4.2, ncurses is distributed under an MIT-style +diff -Naur ncurses-5.9.orig/README.MinGW ncurses-5.9/README.MinGW +--- ncurses-5.9.orig/README.MinGW 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/README.MinGW 2012-08-25 19:58:00.359896408 +0000 +@@ -1,5 +1,5 @@ + ------------------------------------------------------------------------------- +--- Copyright (c) 2008-2010,2011 Free Software Foundation, Inc. -- ++-- Copyright (c) 2008-2011,2012 Free Software Foundation, Inc. -- + -- -- + -- Permission is hereby granted, free of charge, to any person obtaining a -- + -- copy of this software and associated documentation files (the -- +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: README.MinGW,v 1.5 2011/02/26 16:57:17 tom Exp $ ++-- $Id: README.MinGW,v 1.8 2012/01/21 23:55:33 tom Exp $ + -- Author: Juergen Pfeifer + ------------------------------------------------------------------------------- + +@@ -39,7 +39,7 @@ + To build ncurses for native Windows, you need the MinGW toolchain. The + original MinGW toolchain from the above site is only for 32-Bit Windows. As + Windows Server - and also regular workstations - are moving to 64-Bit, it +-seems to be reasonable to have a toolchain that supports both architectures. ++seems to be reasonable to have a toolchain that supports both architectures. + I recommend to use the TDM gcc toolchain which you can find at + http://tdm-gcc.tdragon.net/download. Go to the download section and select + the bundle installer for tdm64 (MinGW-w64). This installs a multilib version +@@ -47,7 +47,7 @@ + versions. It also comes with a working pthread implementation. + + The latest config and build scripts we use for MinGW have only been tested +-for the gcc-4.4 compiler toolchain (or better). ++for the gcc-4.6.1 compiler toolchain (or better). + + Using MinGW is a pragmatic decision, it's the easiest way to port this + heavily UNIX based sourcebase to native Windows. The goal is of course +@@ -55,22 +55,12 @@ + common traditional development environments on Windows, mainly with + Microsoft Visual Studio. + +-If you start a bash from the MSYS environment, please make sure that the +-Microsoft Development tools are in your PATH right after the MinGW +-tools. The LIB.EXE tool is the only one needed. You need this only if +-you want to build DLLs that work with native Windows programs. If you +-don't have any Microsoft Development tools on your machine, consider +-at least to get the free "Visual C++ 2010 Express Edition". +-It contains the LIB.EXE tool. You may also use this compiler to test +-writing native Windows programs using the ncurses DLLs without using +-MinGW then for writing apps. +- + It is necessary to unset the TERM environment variable, to activate the + Windows console-driver. + + Please also make sure that MSYS links to the correct directory containing + your MinGW toolchain. For TDM this is usually C:\MinGW64. In your Windows +-CMD.EXE command shell go to the MSYS root directory (most probably ++CMD.EXE command shell go to the MSYS root directory (most probably + C:\MSYS or C:\MSYS\1.0) and verify, that there is a junction point mingw + that points to the MinGW toolchain directory. If not, delete the mingw + directory and use the mklink command (or the linkd.exe utility on older +@@ -79,58 +69,54 @@ + This code requires WindowsNT 5.1 or better, which means on the client + Windows XP or better, on the server Windows Server 2003 or better. + +-In order to build ncurses for the planned interop layer with .NET, we +-recommend to use these options with configure ++I recommend using libtool to build ncurses on MinGW, because libtool ++knows exactly how to build dll's on Windows for use with MinGW. ++ ++To build a modern but still small footprint ncurses that provides ++hooks for interop, I recommend using these options: + ++ --with-libtool + --disable-home-terminfo +- --enable-reentrant ++ --enable-database ++ --disable-termcap + --enable-sp-funcs + --enable-term-driver + --enable-interop +- --with-pthread (if using TDM toolchain as recommended) + +-This is the configuration commandline as I'm using it at the moment: ++This is the configuration commandline as I'm using it at the moment (assuming environment variable MINGW_ROOT to hold the root directory name of your MinGW build): + + ./configure \ +- --prefix=/mingw \ +- --without-cxx-binding \ ++ --prefix=$MINGW_ROOT \ ++ --with-cxx \ + --without-ada \ + --enable-warnings \ + --enable-assertions \ +- --enable-reentrant \ +- --with-debug \ +- --with-normal \ + --disable-home-terminfo \ ++ --enable-database \ + --enable-sp-funcs \ + --enable-term-driver \ + --enable-interop \ +- --with-pthread ++ --disable-termcap \ ++ --with-progs \ ++ --with-libtool \ ++ --enable-pc-files \ ++ --mandir=$MINGW_ROOT/share/man + +-If you are on a 64-Bit Windows system and want to build a 32-Bit version +-of ncurses, you may use this commandline for configuration (when using +-the TDM toolchain): +- +-CC="gcc -m32" LD="ld -m32" ./configure \ +- --prefix=/mingw \ +- --without-cxx-binding \ +- --without-ada \ +- --enable-warnings \ +- --enable-assertions \ +- --enable-reentrant \ +- --with-debug \ +- --with-normal \ +- --disable-home-terminfo \ +- --enable-sp-funcs \ +- --enable-term-driver \ +- --enable-interop \ +- --with-pthread ++Please note that it is also necessary to set this environment variable: + +-All the options above are - like the whole Windows support - +-experimental. ++export PATH_SEPARATOR=";" ++ ++in order to parse the terminfo paths correctly. Terminfo paths should ++always be separated by a seeeemicolon,even when running under MSYS. + +-In order to build the DLLs, after your regular make you must call ++To support regular expressions properly, ncurses under MinGW should be ++linked against the gnurx regex library, which must be built separately ++under MinGW. See + +- make dlls ++ ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/libgnurx-src-2.5.zip ++ ++All the options above are - like the whole Windows support - ++experimental. + + A lot is still TODO, e.g.: + +diff -Naur ncurses-5.9.orig/aclocal.m4 ncurses-5.9/aclocal.m4 +--- ncurses-5.9.orig/aclocal.m4 2012-08-25 19:57:59.429900806 +0000 ++++ ncurses-5.9/aclocal.m4 2012-08-25 19:58:02.309887187 +0000 +@@ -1,5 +1,5 @@ + dnl*************************************************************************** +-dnl Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++dnl Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + dnl * + dnl Permission is hereby granted, free of charge, to any person obtaining a * + dnl copy of this software and associated documentation files (the * +@@ -28,7 +28,7 @@ + dnl + dnl Author: Thomas E. Dickey 1995-on + dnl +-dnl $Id: aclocal.m4,v 1.553 2011/03/31 23:35:38 tom Exp $ ++dnl $Id: aclocal.m4,v 1.621 2012/08/11 23:36:44 tom Exp $ + dnl Macros used in NCURSES auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -62,6 +62,31 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_ACVERSION_CHECK version: 2 updated: 2011/05/08 11:22:03 ++dnl ------------------ ++dnl Conditionally generate script according to whether we're using a given autoconf. ++dnl ++dnl $1 = version to compare against ++dnl $2 = code to use if AC_ACVERSION is at least as high as $1. ++dnl $3 = code to use if AC_ACVERSION is older than $1. ++define(CF_ACVERSION_CHECK, ++[ ++ifdef([m4_version_compare], ++[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], ++[CF_ACVERSION_COMPARE( ++AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), ++AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_ACVERSION_COMPARE version: 2 updated: 2011/04/14 20:56:50 ++dnl -------------------- ++dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1, ++dnl MAJOR2, MINOR2, TERNARY2, ++dnl PRINTABLE2, not FOUND, FOUND) ++define(CF_ACVERSION_COMPARE, ++[ifelse(builtin([eval], [$2 < $5]), 1, ++[ifelse([$8], , ,[$8])], ++[ifelse([$9], , ,[$9])])])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_ADA_INCLUDE_DIRS version: 6 updated: 2010/02/26 19:52:07 + dnl ------------------- + dnl Construct the list of include-options for the C programs in the Ada95 +@@ -313,12 +338,33 @@ + } + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32 ++dnl CF_ANSI_CC_CHECK version: 11 updated: 2011/07/01 19:47:45 + dnl ---------------- +-dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES' +-dnl in the sharutils 4.2 distribution. ++dnl This was originally adapted from the macros 'fp_PROG_CC_STDC' and ++dnl 'fp_C_PROTOTYPES' in the sharutils 4.2 distribution. + AC_DEFUN([CF_ANSI_CC_CHECK], + [ ++# This should have been defined by AC_PROG_CC ++: ${CC:=cc} ++ ++# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content ++# into CC. This will not help with broken scripts that wrap the compiler with ++# options, but eliminates a more common category of user confusion. ++AC_MSG_CHECKING(\$CC variable) ++case "$CC" in #(vi ++*[[\ \ ]]-[[IUD]]*) ++ AC_MSG_RESULT(broken) ++ AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options) ++ # humor him... ++ cf_flags=`echo "$CC" | sed -e 's/^[[^ ]]*[[ ]]//'` ++ CC=`echo "$CC" | sed -e 's/[[ ]].*//'` ++ CF_ADD_CFLAGS($cf_flags) ++ ;; ++*) ++ AC_MSG_RESULT(ok) ++ ;; ++esac ++ + AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[ + cf_cv_ansi_cc=no + cf_save_CFLAGS="$CFLAGS" +@@ -465,7 +511,7 @@ + AC_SUBST(ARFLAGS) + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_AWK_BIG_PRINTF version: 3 updated: 2008/12/27 12:30:03 ++dnl CF_AWK_BIG_PRINTF version: 4 updated: 2011/10/30 17:09:50 + dnl ----------------- + dnl Check if awk can handle big strings using printf. Some older versions of + dnl awk choke on large strings passed via "%s". +@@ -479,8 +525,8 @@ + eval $2=no + ;; + *) #(vi +- if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' \ +- | $AWK '{ printf "%d\n", length([$]0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then ++ if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' 2>/dev/null \ ++ | $AWK '{ printf "%d\n", length([$]0); }' 2>/dev/null | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then + eval $2=yes + else + eval $2=no +@@ -695,7 +741,7 @@ + AC_SUBST(BUILD_OBJEXT) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_CFG_DEFAULTS version: 7 updated: 2005/09/24 16:15:00 ++dnl CF_CFG_DEFAULTS version: 8 updated: 2011/06/04 20:09:13 + dnl --------------- + dnl Determine the default configuration into which we'll install ncurses. This + dnl can be overridden by the user's command-line options. There's two items to +@@ -713,7 +759,7 @@ + if test "x$prefix" = "xNONE" ; then + case "$cf_cv_system_name" in + # non-vendor systems don't have a conflict +- openbsd*|freebsd*|linux*|cygwin*|k*bsd*-gnu) ++ openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu) + prefix=/usr + ;; + *) prefix=$ac_default_prefix +@@ -749,27 +795,48 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_CGETENT version: 3 updated: 2000/08/12 23:18:52 ++dnl CF_CGETENT version: 4 updated: 2011/08/07 14:54:41 + dnl ---------- + dnl Check if the terminal-capability database functions are available. If not, + dnl ncurses has a much-reduced version. + AC_DEFUN([CF_CGETENT],[ +-AC_MSG_CHECKING(for terminal-capability database functions) +-AC_CACHE_VAL(cf_cv_cgetent,[ ++AC_CACHE_CHECK(for terminal-capability database functions,cf_cv_cgetent,[ + AC_TRY_LINK([ + #include ],[ + char temp[128]; + char *buf = temp; + char *db_array = temp; +- cgetent(&buf, /* int *, */ &db_array, "vt100"); ++ cgetent(&buf, &db_array, "vt100"); + cgetcap(buf, "tc", '='); + cgetmatch(buf, "tc"); + ], + [cf_cv_cgetent=yes], + [cf_cv_cgetent=no]) + ]) +-AC_MSG_RESULT($cf_cv_cgetent) +-test "$cf_cv_cgetent" = yes && AC_DEFINE(HAVE_BSD_CGETENT) ++ ++if test "$cf_cv_cgetent" = yes ++then ++ AC_DEFINE(HAVE_BSD_CGETENT) ++AC_CACHE_CHECK(if cgetent uses const parameter,cf_cv_cgetent_const,[ ++AC_TRY_LINK([ ++#include ],[ ++ char temp[128]; ++ char *buf = temp; ++#ifndef _NETBSD_SOURCE /* given, since April 2004 in stdlib.h */ ++ const char *db_array = temp; ++ cgetent(&buf, &db_array, "vt100"); ++#endif ++ cgetcap(buf, "tc", '='); ++ cgetmatch(buf, "tc"); ++ ], ++ [cf_cv_cgetent_const=yes], ++ [cf_cv_cgetent_const=no]) ++]) ++ if test "$cf_cv_cgetent_const" = yes ++ then ++ AC_DEFINE_UNQUOTED(CGETENT_CONST,const) ++ fi ++fi + ])dnl + dnl --------------------------------------------------------------------------- + dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59 +@@ -908,7 +975,61 @@ + fi + ])])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_CPP_PARAM_INIT version: 4 updated: 2001/04/07 22:31:18 ++dnl CF_CHECK_WCHAR_H version: 1 updated: 2011/10/29 15:01:05 ++dnl ---------------- ++dnl Check if wchar.h can be used, i.e., without defining _XOPEN_SOURCE_EXTENDED ++AC_DEFUN([CF_CHECK_WCHAR_H],[ ++AC_CACHE_CHECK(if wchar.h can be used as is,cf_cv_wchar_h_okay,[ ++AC_TRY_COMPILE( ++[ ++#include ++#include ++],[ ++ wint_t foo = 0; ++ int bar = iswpunct(foo)], ++ [cf_cv_wchar_h_okay=yes], ++ [cf_cv_wchar_h_okay=no])]) ++ ++if test $cf_cv_wchar_h_okay = no ++then ++ CF_PREDEFINE(_XOPEN_SOURCE_EXTENDED) ++fi ++])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39 ++dnl ----------------- ++dnl Check if the given compiler is really clang. clang's C driver defines ++dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does ++dnl not ignore some gcc options. ++dnl ++dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to ++dnl ensure that it is not mistaken for gcc/g++. It is normally invoked from ++dnl the wrappers for gcc and g++ warnings. ++dnl ++dnl $1 = GCC (default) or GXX ++dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS ++dnl $3 = CFLAGS (default) or CXXFLAGS ++AC_DEFUN([CF_CLANG_COMPILER],[ ++ifelse([$2],,CLANG_COMPILER,[$2])=no ++ ++if test "$ifelse([$1],,[$1],GCC)" = yes ; then ++ AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler) ++ cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])" ++ ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments" ++ AC_TRY_COMPILE([],[ ++#ifdef __clang__ ++#else ++make an error ++#endif ++],[ifelse([$2],,CLANG_COMPILER,[$2])=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" ++],[]) ++ ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" ++ AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2])) ++fi ++]) ++dnl --------------------------------------------------------------------------- ++dnl CF_CPP_PARAM_INIT version: 5 updated: 2011/12/03 16:54:03 + dnl ----------------- + dnl Check if the C++ compiler accepts duplicate parameter initialization. This + dnl is a late feature for the standard and is not in some recent compilers +@@ -932,7 +1053,7 @@ + { + value = x; + } +-void main() { } ++int main() { } + ], + [cf_cv_cpp_param_init=yes], + [cf_cv_cpp_param_init=no], +@@ -999,7 +1120,55 @@ + test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_C_INLINE version: 3 updated: 2010/05/01 15:14:41 ++dnl CF_CXX_AR_FLAGS version: 1 updated: 2011/10/29 08:35:34 ++dnl --------------- ++dnl Setup special archiver flags for given compilers. ++AC_DEFUN([CF_CXX_AR_FLAGS],[ ++ CXX_AR='$(AR)' ++ CXX_ARFLAGS='$(ARFLAGS)' ++ case $cf_cv_system_name in #(vi ++ irix*) #(vi ++ if test "$GXX" != yes ; then ++ CXX_AR='$(CXX)' ++ CXX_ARFLAGS='-ar -o' ++ fi ++ ;; ++ sco3.2v5*) #(vi ++ CXXLDFLAGS="-u main" ++ ;; ++ solaris2*) ++ if test "$GXX" != yes ; then ++ CXX_AR='$(CXX)' ++ CXX_ARFLAGS='-xar -o' ++ fi ++ ;; ++ esac ++ AC_SUBST(CXXLDFLAGS) ++ AC_SUBST(CXX_AR) ++ AC_SUBST(CXX_ARFLAGS) ++])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_CXX_IOSTREAM_NAMESPACE version: 1 updated: 2011/10/29 08:35:34 ++dnl ------------------------- ++dnl For c++, check if iostream uses "std::" namespace. ++AC_DEFUN([CF_CXX_IOSTREAM_NAMESPACE],[ ++AC_CHECK_HEADERS(iostream) ++if test x"$ac_cv_header_iostream" = xyes ; then ++ AC_MSG_CHECKING(if iostream uses std-namespace) ++ AC_TRY_COMPILE([ ++#include ++using std::endl; ++using std::cerr;],[ ++cerr << "testing" << endl; ++],[cf_iostream_namespace=yes],[cf_iostream_namespace=no]) ++ AC_MSG_RESULT($cf_iostream_namespace) ++ if test "$cf_iostream_namespace" = yes ; then ++ AC_DEFINE(IOSTREAM_NAMESPACE) ++ fi ++fi ++])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_C_INLINE version: 4 updated: 2012/06/16 14:55:39 + dnl ----------- + dnl Check if the C compiler supports "inline". + dnl $1 is the name of a shell variable to set if inline is supported +@@ -1012,6 +1181,9 @@ + if test "$INTEL_COMPILER" = yes + then + : ++ elif test "$CLANG_COMPILER" = yes ++ then ++ : + elif test "$GCC" = yes + then + AC_CACHE_CHECK(if $CC supports options to tune inlining,cf_cv_gcc_inline,[ +@@ -1057,6 +1229,43 @@ + AC_SUBST(DIRS_TO_MAKE) + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57 ++dnl --------------- ++dnl You can always use "make -n" to see the actual options, but it's hard to ++dnl pick out/analyze warning messages when the compile-line is long. ++dnl ++dnl Sets: ++dnl ECHO_LT - symbol to control if libtool is verbose ++dnl ECHO_LD - symbol to prefix "cc -o" lines ++dnl RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o) ++dnl SHOW_CC - symbol to put before explicit "cc -c" lines ++dnl ECHO_CC - symbol to put before any "cc" line ++dnl ++AC_DEFUN([CF_DISABLE_ECHO],[ ++AC_MSG_CHECKING(if you want to see long compiling messages) ++CF_ARG_DISABLE(echo, ++ [ --disable-echo display "compiling" commands], ++ [ ++ ECHO_LT='--silent' ++ ECHO_LD='@echo linking [$]@;' ++ RULE_CC='@echo compiling [$]<' ++ SHOW_CC='@echo compiling [$]@' ++ ECHO_CC='@' ++],[ ++ ECHO_LT='' ++ ECHO_LD='' ++ RULE_CC='' ++ SHOW_CC='' ++ ECHO_CC='' ++]) ++AC_MSG_RESULT($enableval) ++AC_SUBST(ECHO_LT) ++AC_SUBST(ECHO_LD) ++AC_SUBST(RULE_CC) ++AC_SUBST(SHOW_CC) ++AC_SUBST(ECHO_CC) ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_DISABLE_LEAKS version: 6 updated: 2010/07/23 04:14:32 + dnl ---------------- + dnl Combine no-leak checks with the libraries or tools that are used for the +@@ -1123,6 +1332,30 @@ + fi + ]) + dnl --------------------------------------------------------------------------- ++dnl CF_ENABLE_PC_FILES version: 9 updated: 2012/08/04 13:59:54 ++dnl ------------------ ++dnl This is the "--enable-pc-files" option, which is available if there is a ++dnl pkg-config configuration on the local machine. ++AC_DEFUN([CF_ENABLE_PC_FILES],[ ++AC_REQUIRE([CF_PKG_CONFIG]) ++AC_REQUIRE([CF_WITH_PKG_CONFIG_LIBDIR]) ++ ++if test "$PKG_CONFIG" != none ; then ++ AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG) ++ AC_ARG_ENABLE(pc-files, ++ [ --enable-pc-files generate and install .pc files for pkg-config], ++ [enable_pc_files=$enableval], ++ [enable_pc_files=no]) ++ AC_MSG_RESULT($enable_pc_files) ++ if test "$enable_pc_files" != no ++ then ++ CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR) ++ fi ++else ++ enable_pc_files=no ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_ENABLE_RPATH version: 2 updated: 2010/03/27 18:39:42 + dnl --------------- + dnl Check if the rpath option should be used, setting cache variable +@@ -1137,6 +1370,37 @@ + AC_MSG_RESULT($cf_cv_enable_rpath) + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_ENABLE_STRING_HACKS version: 1 updated: 2012/02/25 06:33:21 ++dnl ---------------------- ++dnl On a few platforms, the compiler and/or loader nags with untruthful ++dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect, ++dnl and implying that most uses of the recommended alternatives are correct. ++dnl ++dnl Factually speaking, no one has actually counted the number of uses of these ++dnl functions versus the total of incorrect uses. Samples of a few thousand ++dnl instances are meaningless compared to the hundreds of millions of lines of ++dnl existing C code. ++dnl ++dnl strlcat/strlcpy are (as of 2012) non-standard, and are available on some ++dnl platforms, in implementations of varying quality. Likewise, snprintf is ++dnl standard - but evolved through phases, and older implementations are likely ++dnl to yield surprising results, as documented in manpages on various systems. ++AC_DEFUN([CF_ENABLE_STRING_HACKS], ++[ ++AC_MSG_CHECKING(if you want to work around bogus compiler/loader warnings) ++AC_ARG_ENABLE(string-hacks, ++ [ --enable-string-hacks work around bogus compiler/loader warnings], ++ [with_string_hacks=$enableval], ++ [with_string_hacks=no]) ++AC_MSG_RESULT($with_string_hacks) ++ ++if test "x$with_string_hacks" = "xyes"; then ++ AC_DEFINE(USE_STRING_HACKS) ++ AC_MSG_WARN(enabling string-hacks to work around bogus compiler/loader warnings) ++ AC_CHECK_FUNCS( strlcat strlcpy snprintf ) ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_ERRNO version: 5 updated: 1997/11/30 12:44:39 + dnl -------- + dnl Check if 'errno' is declared in +@@ -1145,7 +1409,7 @@ + CF_CHECK_ERRNO(errno) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_ETIP_DEFINES version: 3 updated: 2003/03/22 19:13:43 ++dnl CF_ETIP_DEFINES version: 5 updated: 2012/02/18 17:51:07 + dnl --------------- + dnl Test for conflicting definitions of exception in gcc 2.8.0, etc., between + dnl math.h and builtin.h, only for ncurses +@@ -1154,11 +1418,17 @@ + AC_MSG_CHECKING(for special defines needed for etip.h) + cf_save_CXXFLAGS="$CXXFLAGS" + cf_result="none" ++ ++# etip.h includes ncurses.h which includes ncurses_dll.h ++# But ncurses_dll.h is generated - fix here. ++test -d include || mkdir include ++test -f include/ncurses_dll.h || sed -e 's/@NCURSES_WRAP_PREFIX@/'$NCURSES_WRAP_PREFIX'/g' ${srcdir}/include/ncurses_dll.h.in >include/ncurses_dll.h ++ + for cf_math in "" MATH_H + do + for cf_excp in "" MATH_EXCEPTION + do +- CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -I${srcdir}/include" ++ CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -Iinclude -I${srcdir}/include" + test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" + test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" + AC_TRY_COMPILE([ +@@ -1167,7 +1437,7 @@ + test -n "$cf_math" && AC_DEFINE_UNQUOTED(ETIP_NEEDS_${cf_math}) + test -n "$cf_excp" && AC_DEFINE_UNQUOTED(ETIP_NEEDS_${cf_excp}) + cf_result="$cf_math $cf_excp" +- break ++ break 2 + ],[]) + done + done +@@ -1305,6 +1575,25 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_FIXUP_ADAFLAGS version: 1 updated: 2012/03/31 18:48:10 ++dnl ----------------- ++dnl make ADAFLAGS consistent with CFLAGS ++AC_DEFUN([CF_FIXUP_ADAFLAGS],[ ++ AC_MSG_CHECKING(optimization options for ADAFLAGS) ++ case "$CFLAGS" in ++ *-g*) ++ CF_ADD_ADAFLAGS(-g) ++ ;; ++ esac ++ case "$CFLAGS" in ++ *-O*) ++ cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[[ ]].*//'` ++ CF_ADD_ADAFLAGS($cf_O_flag) ++ ;; ++ esac ++ AC_MSG_RESULT($ADAFLAGS) ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_FUNC_DLSYM version: 2 updated: 2010/05/29 16:31:02 + dnl ------------- + dnl Test for dlsym() and related functions, as well as libdl. +@@ -1433,14 +1722,17 @@ + ]) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_FUNC_POLL version: 4 updated: 2006/12/16 12:33:30 ++dnl CF_FUNC_POLL version: 7 updated: 2012/06/09 16:22:17 + dnl ------------ + dnl See if the poll function really works. Some platforms have poll(), but + dnl it does not work for terminals or files. + AC_DEFUN([CF_FUNC_POLL],[ + AC_CACHE_CHECK(if poll really works,cf_cv_working_poll,[ + AC_TRY_RUN([ ++#include + #include ++#include ++#include + #ifdef HAVE_POLL_H + #include + #else +@@ -1450,11 +1742,34 @@ + struct pollfd myfds; + int ret; + +- myfds.fd = 0; ++ /* check for Darwin bug with respect to "devices" */ ++ myfds.fd = open("/dev/null", 1); /* O_WRONLY */ ++ if (myfds.fd < 0) ++ myfds.fd = 0; + myfds.events = POLLIN; ++ myfds.revents = 0; + + ret = poll(&myfds, 1, 100); +- ${cf_cv_main_return:-return}(ret != 0); ++ ++ if (ret < 0 || (myfds.revents & POLLNVAL)) { ++ ret = -1; ++ } else { ++ int fd = 0; ++ if (!isatty(fd)) { ++ fd = open("/dev/tty", 2); /* O_RDWR */ ++ } ++ ++ if (fd >= 0) { ++ /* also check with standard input */ ++ myfds.fd = fd; ++ myfds.events = POLLIN; ++ myfds.revents = 0; ++ ret = poll(&myfds, 1, 100); ++ } else { ++ ret = -1; ++ } ++ } ++ ${cf_cv_main_return:-return}(ret < 0); + }], + [cf_cv_working_poll=yes], + [cf_cv_working_poll=no], +@@ -1660,7 +1975,7 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32 ++dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39 + dnl --------------- + dnl Check if the compiler supports useful warning options. There's a few that + dnl we don't use, simply because they're too noisy: +@@ -1683,6 +1998,7 @@ + [ + AC_REQUIRE([CF_GCC_VERSION]) + CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) ++CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS) + + cat > conftest.$ac_ext <], ++[int x = optind; char *y = optarg], ++[cf_cv_getopt_header=$cf_header ++ break]) ++done ++]) ++if test $cf_cv_getopt_header != none ; then ++ AC_DEFINE(HAVE_GETOPT_HEADER) ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_GNAT_GENERICS version: 2 updated: 2011/03/23 20:24:41 + dnl ---------------- + AC_DEFUN([CF_GNAT_GENERICS], +@@ -2040,7 +2386,7 @@ + rm -rf conftest* *~conftest* + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GNAT_VERSION version: 17 updated: 2011/03/23 20:24:41 ++dnl CF_GNAT_VERSION version: 18 updated: 2012/01/21 19:28:10 + dnl --------------- + dnl Verify version of GNAT. + AC_DEFUN([CF_GNAT_VERSION], +@@ -2052,7 +2398,7 @@ + AC_MSG_RESULT($cf_gnat_version) + + case $cf_gnat_version in #(vi +-3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*) #(vi ++3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]]) #(vi + cf_cv_prog_gnat_correct=yes + ;; + *) +@@ -2136,21 +2482,21 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GXX_VERSION version: 6 updated: 2010/10/23 15:44:18 ++dnl CF_GXX_VERSION version: 7 updated: 2012/06/16 14:55:39 + dnl -------------- + dnl Check for version of g++ + AC_DEFUN([CF_GXX_VERSION],[ + AC_REQUIRE([AC_PROG_CPP]) + GXX_VERSION=none + if test "$GXX" = yes; then +- AC_MSG_CHECKING(version of g++) ++ AC_MSG_CHECKING(version of ${CXX:-g++}) + GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" + test -z "$GXX_VERSION" && GXX_VERSION=unknown + AC_MSG_RESULT($GXX_VERSION) + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GXX_WARNINGS version: 6 updated: 2010/08/14 18:25:37 ++dnl CF_GXX_WARNINGS version: 7 updated: 2012/06/16 14:55:39 + dnl --------------- + dnl Check if the compiler supports useful warning options. + dnl +@@ -2173,6 +2519,7 @@ + [ + + CF_INTEL_COMPILER(GXX,INTEL_CPLUSPLUS,CXXFLAGS) ++CF_CLANG_COMPILER(GXX,CLANG_CPLUSPLUS,CXXFLAGS) + + AC_REQUIRE([CF_GXX_VERSION]) + +@@ -2581,7 +2928,7 @@ + ]) + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_LDFLAGS_STATIC version: 8 updated: 2010/10/23 14:39:56 ++dnl CF_LDFLAGS_STATIC version: 10 updated: 2011/09/24 12:51:48 + 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 +@@ -2602,7 +2949,7 @@ + esac + else + case $cf_cv_system_name in #( +- aix[[456]]*) #( from ld manpage ++ aix[[4-7]]*) #( from ld manpage + LDFLAGS_STATIC=-bstatic + LDFLAGS_SHARED=-bdynamic + ;; +@@ -2652,7 +2999,17 @@ + int cf_ldflags_static(FILE *fp); + ],[ + return cf_ldflags_static(stdin); +-],[cf_ldflags_static=yes],[cf_ldflags_static=no]) ++],[ ++ # some linkers simply ignore the -dynamic ++ case x`file conftest$ac_exeext 2>/dev/null` in #(vi ++ *static*) # (vi ++ cf_ldflags_static=no ++ ;; ++ *) ++ cf_ldflags_static=yes ++ ;; ++ esac ++],[cf_ldflags_static=no]) + + rm -f libconftest.* + LIBS="$cf_save_LIBS" +@@ -2673,7 +3030,7 @@ + AC_SUBST(LDFLAGS_SHARED) + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_LD_RPATH_OPT version: 3 updated: 2010/06/02 05:03:05 ++dnl CF_LD_RPATH_OPT version: 5 updated: 2011/07/17 14:48:41 + dnl --------------- + dnl For the given system and compiler, find the compiler flags to pass to the + dnl loader to use the "rpath" feature. +@@ -2694,10 +3051,10 @@ + linux*|gnu*|k*bsd*-gnu) #(vi + LD_RPATH_OPT="-Wl,-rpath," + ;; +-openbsd[[2-9]].*) #(vi ++openbsd[[2-9]].*|mirbsd*) #(vi + LD_RPATH_OPT="-Wl,-rpath," + ;; +-freebsd*) #(vi ++dragonfly*|freebsd*) #(vi + LD_RPATH_OPT="-rpath " + ;; + netbsd*) #(vi +@@ -2756,11 +3113,11 @@ + $1="$cf_library_path_list [$]$1" + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16 ++dnl CF_LIB_PREFIX version: 9 updated: 2012/01/21 19:28:10 + dnl ------------- + dnl Compute the library-prefix for the given host system + dnl $1 = variable to set +-AC_DEFUN([CF_LIB_PREFIX], ++define([CF_LIB_PREFIX], + [ + case $cf_cv_system_name in #(vi + OS/2*|os2*) #(vi +@@ -2773,7 +3130,7 @@ + AC_SUBST(LIB_PREFIX) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_LIB_RULES version: 61 updated: 2010/10/23 16:10:30 ++dnl CF_LIB_RULES version: 65 updated: 2012/06/30 17:25:25 + 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 +@@ -2788,13 +3145,15 @@ + dnl lib.so.. + AC_DEFUN([CF_LIB_RULES], + [ +-CF_LIB_PREFIX(cf_prefix) ++cf_prefix=$LIB_PREFIX + AC_REQUIRE([CF_SUBST_NCURSES_VERSION]) + +-if test $cf_cv_shlib_version = cygdll ; then ++case $cf_cv_shlib_version in #(vi ++cygdll|mingw) + TINFO_NAME=$TINFO_ARG_SUFFIX + TINFO_SUFFIX=.dll +-fi ++ ;; ++esac + + if test -n "$TINFO_SUFFIX" ; then + case $TINFO_SUFFIX in +@@ -2880,11 +3239,18 @@ + # cygwin needs import library, and has unique naming convention + # use autodetected ${cf_prefix} for import lib and static lib, but + # use 'cyg' prefix for shared lib. +- if test $cf_cv_shlib_version = cygdll ; then ++ case $cf_cv_shlib_version in #(vi ++ cygdll) #(vi + cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` + LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}${cf_cygsuf}" + continue +- fi ++ ;; ++ mingw) ++ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` ++ LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/lib${cf_dir}${cf_cygsuf}" ++ continue ++ ;; ++ esac + fi + LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/${cf_prefix}${cf_dir}${cf_suffix}" + done +@@ -2928,7 +3294,7 @@ + mv $cf_dir/Makefile.out $cf_dir/Makefile + + $AWK -f $srcdir/mk-0th.awk \ +- libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" \ ++ libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" ticlib="$TICS_LIB_SUFFIX" termlib="$TINFO_LIB_SUFFIX" \ + $srcdir/$cf_dir/modules >>$cf_dir/Makefile + + for cf_subset in $cf_subsets +@@ -3010,6 +3376,7 @@ + prefix=$cf_prefix \ + suffix=$cf_suffix \ + subset=$cf_subset \ ++ driver=$cf_cv_term_driver \ + SymLink="$LN_S" \ + TermlibRoot=$TINFO_NAME \ + TermlibSuffix=$TINFO_SUFFIX \ +@@ -3292,7 +3659,7 @@ + ]) + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03 ++dnl CF_LIB_SUFFIX version: 18 updated: 2012/02/25 15:20:07 + dnl ------------- + dnl Compute the library file-suffix from the given model name + dnl $1 = model name +@@ -3321,11 +3688,11 @@ + ;; + shared) #(vi + case $cf_cv_system_name in +- aix[[56]]*) #(vi ++ aix[[5-7]]*) #(vi + $2='.a' + $3=[$]$2 + ;; +- cygwin*) #(vi ++ cygwin*|mingw*) #(vi + $2='.dll' + $3='.dll.a' + ;; +@@ -3799,7 +4166,7 @@ + AC_MSG_RESULT($MANPAGE_TBL) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_MAN_PAGES version: 39 updated: 2010/10/23 15:44:18 ++dnl CF_MAN_PAGES version: 41 updated: 2012/08/11 19:35:44 + 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 +@@ -3856,6 +4223,7 @@ + # this script is generated by the configure-script CF_MAN_PAGES macro. + + prefix="$cf_prefix" ++datarootdir="$datarootdir" + datadir="$datadir" + + NCURSES_MAJOR="$NCURSES_MAJOR" +@@ -3949,7 +4317,9 @@ + + if test "$MANPAGE_ALIASES" != no ; then + cat >>$cf_edit_man <>$cf_edit_man <\$TMP.out ++ mv \$TMP.out \$TMP ++CF_EOF ++fi ++ + if test $with_curses_h != yes ; then + cat >>$cf_edit_man <\$TMP.out +@@ -4184,7 +4561,7 @@ + test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37 ++dnl CF_MKSTEMP version: 8 updated: 2012/02/13 20:34:56 + dnl ---------- + dnl Check for a working mkstemp. This creates two files, checks that they are + dnl successfully created and distinct (AmigaOS apparently fails on the last). +@@ -4226,9 +4603,11 @@ + } + ],[cf_cv_func_mkstemp=yes + ],[cf_cv_func_mkstemp=no +-],[AC_CHECK_FUNC(mkstemp) +-]) ++],[cf_cv_func_mkstemp=maybe]) + ]) ++if test "x$cf_cv_func_mkstemp" = xmaybe ; then ++ AC_CHECK_FUNC(mkstemp) ++fi + if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then + AC_DEFINE(HAVE_MKSTEMP) + fi +@@ -4339,7 +4718,7 @@ + AC_SUBST(PATH_SEPARATOR) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_PATH_SYNTAX version: 13 updated: 2010/05/26 05:38:42 ++dnl CF_PATH_SYNTAX version: 14 updated: 2012/06/19 20:58:54 + dnl -------------- + dnl Check the argument to see that it looks like a pathname. Rewrite it if it + dnl begins with one of the prefix/exec_prefix variables, and then again if the +@@ -4359,7 +4738,7 @@ + ;; + .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX + ;; +-.\[$]{*prefix}*) #(vi ++.\[$]{*prefix}*|.\[$]{*dir}*) #(vi + eval $1="[$]$1" + case ".[$]$1" in #(vi + .NONE/*) +@@ -4376,7 +4755,7 @@ + esac + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_PKG_CONFIG version: 4 updated: 2011/02/18 20:26:24 ++dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22 + dnl ------------- + dnl Check for the package-config program, unless disabled by command-line. + AC_DEFUN([CF_PKG_CONFIG], +@@ -4393,7 +4772,9 @@ + PKG_CONFIG=none + ;; + yes) #(vi +- AC_PATH_TOOL(PKG_CONFIG, pkg-config, none) ++ CF_ACVERSION_CHECK(2.52, ++ [AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)], ++ [AC_PATH_PROG(PKG_CONFIG, pkg-config, none)]) + ;; + *) + PKG_CONFIG=$withval +@@ -4658,7 +5039,7 @@ + test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT") + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_PROG_GNAT version: 1 updated: 2010/06/19 15:22:18 ++dnl CF_PROG_GNAT version: 2 updated: 2011/10/22 14:01:47 + dnl ------------ + dnl Check for gnatmake, ensure that it is complete. + AC_DEFUN([CF_PROG_GNAT],[ +@@ -4666,6 +5047,7 @@ + AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no) + if test "$ac_cv_prog_gnat_exists" = no; then + cf_ada_make= ++ cf_cv_prog_gnat_correct=no + else + CF_GNAT_VERSION + AC_CHECK_PROG(M4_exists, m4, yes, no) +@@ -4709,7 +5091,7 @@ + esac + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_PROG_LDCONFIG version: 2 updated: 2008/12/13 14:08:40 ++dnl CF_PROG_LDCONFIG version: 3 updated: 2011/06/04 20:09:13 + dnl ---------------- + dnl Check for ldconfig, needed to fixup shared libraries that would be built + dnl and then used in the install. +@@ -4718,7 +5100,7 @@ + LDCONFIG=: + else + case "$cf_cv_system_name" in #(vi +-dragonfly*|freebsd*) #(vi ++dragonfly*|mirbsd*|freebsd*) #(vi + test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R" + ;; + *) LDPATH=$PATH:/sbin:/usr/sbin +@@ -4759,7 +5141,7 @@ + test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_REGEX version: 8 updated: 2010/08/07 14:09:44 ++dnl CF_REGEX version: 9 updated: 2012/01/07 15:08:24 + dnl -------- + dnl Attempt to determine if we've got one of the flavors of regular-expression + dnl code that we can support. +@@ -4771,7 +5153,7 @@ + cf_regex_libs="regex re" + case $host_os in #(vi + mingw*) +- cf_regex_libs="regex.dll $cf_regex_libs" ++ cf_regex_libs="gnurx $cf_regex_libs" + ;; + esac + +@@ -4984,7 +5366,7 @@ + AC_SUBST(EXTRA_LDFLAGS) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_SHARED_OPTS version: 64 updated: 2010/06/05 16:51:16 ++dnl CF_SHARED_OPTS version: 70 updated: 2012/02/25 15:20:07 + dnl -------------- + dnl -------------- + dnl Attempt to determine the appropriate CC/LD options for creating a shared +@@ -5059,10 +5441,14 @@ + cf_cv_shlib_version_infix=no + + case $cf_cv_system_name in #(vi +- aix[[56]]*) #(vi ++ aix4.[3-9]*|aix[[5-7]]*) #(vi + if test "$GCC" = yes; then + CC_SHARED_OPTS= +- MK_SHARED_LIB='$(CC) -shared' ++ MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@' ++ else ++ # CC_SHARED_OPTS='-qpic=large -G' ++ # perhaps "-bM:SRE -bnoentry -bexpall" ++ MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@' + fi + ;; + beos*) #(vi +@@ -5115,9 +5501,19 @@ + # readonly to exploit a quirk in the memory manager. + INSTALL_LIB="-m 555" + ;; ++ interix*) ++ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel ++ if test "$cf_cv_shlib_version" = rel; then ++ cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}' ++ else ++ cf_shared_soname='`basename $@`' ++ fi ++ CC_SHARED_OPTS= ++ MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $@' ++ ;; + irix*) #(vi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + # tested with IRIX 5.2 and 'cc'. + if test "$GCC" != yes; then +@@ -5134,18 +5530,39 @@ + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CF_SHARED_SONAME + MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]' + ;; +- openbsd[[2-9]].*) #(vi ++ mingw*) #(vi ++ cf_cv_shlib_version=mingw ++ cf_cv_shlib_version_infix=mingw ++ CC_SHARED_OPTS= ++ MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}' ++ #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]' ++ #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]' ++ cat >mk_shared_lib.sh <<-CF_EOF ++ #!/bin/sh ++ SHARED_LIB=\[$]1 ++ IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\` ++ shift ++ cat <<-EOF ++ Linking shared library ++ ** SHARED_LIB \[$]SHARED_LIB ++ ** IMPORT_LIB \[$]IMPORT_LIB ++EOF ++ exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB} ++CF_EOF ++ chmod +x mk_shared_lib.sh ++ ;; ++ openbsd[[2-9]].*|mirbsd*) #(vi + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + CF_SHARED_SONAME +@@ -5156,12 +5573,12 @@ + MK_SHARED_LIB='${LD} -Bshareable -o $[@]' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + ;; +- freebsd*) #(vi ++ dragonfly*|freebsd*) #(vi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" +- LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${libdir} $LOCAL_LDFLAGS" +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CF_SHARED_SONAME + MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]' +@@ -5171,7 +5588,7 @@ + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + if test "$cf_cv_shlib_version" = auto; then + if test -f /usr/libexec/ld.elf_so; then + cf_cv_shlib_version=abi +@@ -5276,9 +5693,12 @@ + ;; + esac + +- if test -n "$cf_ld_rpath_opt" ; then +- MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}" +- fi ++ # RPATH_LIST is a colon-separated list of directories ++ test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" ++ test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" ++ ++ CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS) ++ CF_VERBOSE(MK_SHARED_LIB: $MK_SHARED_LIB) + + AC_SUBST(CC_SHARED_OPTS) + AC_SUBST(LD_RPATH_OPT) +@@ -5290,6 +5710,7 @@ + AC_SUBST(LOCAL_LDFLAGS) + AC_SUBST(LOCAL_LDFLAGS2) + AC_SUBST(INSTALL_LIB) ++ AC_SUBST(RPATH_LIST) + ])dnl + dnl --------------------------------------------------------------------------- + dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43 +@@ -5474,7 +5895,7 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_SRC_MODULES version: 21 updated: 2010/09/04 17:37:40 ++dnl CF_SRC_MODULES version: 26 updated: 2012/01/07 15:08:24 + dnl -------------- + dnl For each parameter, test if the source-directory exists, and if it contains + dnl a 'modules' file. If so, add to the list $cf_cv_src_modules which we'll +@@ -5497,6 +5918,7 @@ + TEST_ARG2="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARG2" + fi + ++PC_MODULES_TO_MAKE="ncurses${DFT_ARG_SUFFIX}" + cf_cv_src_modules= + for cf_dir in $1 + do +@@ -5535,6 +5957,7 @@ + TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS" + TEST_ARG2="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARG2" + fi ++ PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ${cf_dir}${DFT_ARG_SUFFIX}" + fi + fi + done +@@ -5562,10 +5985,18 @@ + SRC_SUBDIRS="$SRC_SUBDIRS test" + fi + test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc" +-test "$cf_with_cxx_binding" != no && SRC_SUBDIRS="$SRC_SUBDIRS c++" ++if test "$cf_with_cxx_binding" != no; then ++ PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ncurses++${DFT_ARG_SUFFIX}" ++ SRC_SUBDIRS="$SRC_SUBDIRS c++" ++fi ++ ++test "x$with_termlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TINFO_ARG_SUFFIX" ++test "x$with_ticlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TICS_ARG_SUFFIX" ++ ++AC_SUBST(PC_MODULES_TO_MAKE) + + ADA_SUBDIRS= +-if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then ++if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = xyes && test -f $srcdir/Ada95/Makefile.in; then + SRC_SUBDIRS="$SRC_SUBDIRS Ada95" + ADA_SUBDIRS="gen src" + if test "x$cf_with_tests" != "xno" ; then +@@ -5624,13 +6055,13 @@ + AC_DEFUN([CF_STRIP_G_OPT], + [$1=`echo ${$1} | sed -e 's%-g %%' -e 's%-g$%%'`])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_STRUCT_SIGACTION version: 3 updated: 2000/08/12 23:18:52 ++dnl CF_STRUCT_SIGACTION version: 4 updated: 2011/04/16 11:52:53 + dnl ------------------- + dnl Check if we need _POSIX_SOURCE defined to use struct sigaction. We'll only + dnl do this if we've found the sigaction function. +-dnl +-dnl If needed, define SVR4_ACTION. + AC_DEFUN([CF_STRUCT_SIGACTION],[ ++AC_REQUIRE([CF_XOPEN_SOURCE]) ++ + if test "$ac_cv_func_sigaction" = yes; then + AC_MSG_CHECKING(whether sigaction needs _POSIX_SOURCE) + AC_TRY_COMPILE([ +@@ -5645,22 +6076,24 @@ + #include ], + [struct sigaction act], + [sigact_bad=yes +- AC_DEFINE(SVR4_ACTION)], ++ AC_DEFINE(_POSIX_SOURCE)], + [sigact_bad=unknown])]) + AC_MSG_RESULT($sigact_bad) + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_STRUCT_TERMIOS version: 5 updated: 2000/11/04 12:22:46 ++dnl CF_STRUCT_TERMIOS version: 6 updated: 2011/04/16 11:52:53 + dnl ----------------- + dnl Some machines require _POSIX_SOURCE to completely define struct termios. +-dnl If so, define SVR4_TERMIO + AC_DEFUN([CF_STRUCT_TERMIOS],[ ++AC_REQUIRE([CF_XOPEN_SOURCE]) ++ + AC_CHECK_HEADERS( \ + termio.h \ + termios.h \ + unistd.h \ + ) ++ + if test "$ISC" = yes ; then + AC_CHECK_HEADERS( sys/termio.h ) + fi +@@ -5680,7 +6113,7 @@ + #include ], + [struct termios foo; int x = foo.c_iflag], + termios_bad=unknown, +- termios_bad=yes AC_DEFINE(SVR4_TERMIO)) ++ termios_bad=yes AC_DEFINE(_POSIX_SOURCE)) + ]) + AC_MSG_RESULT($termios_bad) + fi +@@ -5798,6 +6231,45 @@ + AC_SUBST(top_builddir) + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_TRY_XOPEN_SOURCE version: 1 updated: 2011/10/30 17:09:50 ++dnl ------------------- ++dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we ++dnl can define it successfully. ++AC_DEFUN([CF_TRY_XOPEN_SOURCE],[ ++AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ ++ AC_TRY_COMPILE([ ++#include ++#include ++#include ++],[ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif], ++ [cf_cv_xopen_source=no], ++ [cf_save="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ++ AC_TRY_COMPILE([ ++#include ++#include ++#include ++],[ ++#ifdef _XOPEN_SOURCE ++make an error ++#endif], ++ [cf_cv_xopen_source=no], ++ [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) ++ CPPFLAGS="$cf_save" ++ ]) ++]) ++ ++if test "$cf_cv_xopen_source" != no ; then ++ CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) ++ CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) ++ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" ++ CF_ADD_CFLAGS($cf_temp_xopen_source) ++fi ++]) ++dnl --------------------------------------------------------------------------- + dnl CF_TYPEOF_CHTYPE version: 8 updated: 2006/12/16 12:33:30 + dnl ---------------- + dnl Determine the type we should use for chtype (and attr_t, which is treated +@@ -6182,7 +6654,7 @@ + fi + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_WITH_LIBTOOL version: 26 updated: 2010/10/23 15:55:24 ++dnl CF_WITH_LIBTOOL version: 28 updated: 2011/07/02 15:40:32 + dnl --------------- + dnl Provide a configure option to incorporate libtool. Define several useful + dnl symbols for the makefile rules. +@@ -6258,7 +6730,7 @@ + AC_MSG_ERROR(Cannot find libtool) + fi + ])dnl +- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o' ++ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o' + LIB_OBJECT='${OBJECTS:.o=.lo}' + LIB_SUFFIX=.la + LIB_CLEAN='${LIBTOOL} --mode=clean' +@@ -6283,7 +6755,7 @@ + # special hack to add -no-undefined (which libtool should do for itself) + LT_UNDEF= + case "$cf_cv_system_name" in #(vi +- cygwin*|mingw32*|uwin*|aix[[456]]) #(vi ++ cygwin*|mingw32*|uwin*|aix[[4-7]]) #(vi + LT_UNDEF=-no-undefined + ;; + esac +@@ -6323,6 +6795,32 @@ + + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_WITH_LIB_PREFIX version: 1 updated: 2012/01/21 19:28:10 ++dnl ------------------ ++dnl Allow the library-prefix to be overridden. OS/2 EMX originally had no ++dnl "lib" prefix, e.g., because it used the dll naming convention. ++dnl ++dnl $1 = variable to set ++AC_DEFUN([CF_WITH_LIB_PREFIX], ++[ ++AC_MSG_CHECKING(if you want to have a library-prefix) ++AC_ARG_WITH(lib-prefix, ++ [ --with-lib-prefix override library-prefix], ++ [with_lib_prefix=$withval], ++ [with_lib_prefix=auto]) ++AC_MSG_RESULT($with_lib_prefix) ++ ++if test $with_lib_prefix = auto ++then ++ CF_LIB_PREFIX($1) ++elif test $with_lib_prefix = no ++then ++ LIB_PREFIX= ++else ++ LIB_PREFIX=$with_lib_prefix ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_WITH_PATH version: 10 updated: 2010/10/23 15:44:18 + dnl ------------ + dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just +@@ -6386,7 +6884,50 @@ + + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_WITH_PTHREAD version: 3 updated: 2010/05/29 16:31:02 ++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 2 updated: 2011/12/10 18:58:47 ++dnl ------------------------- ++dnl Allow the choice of the pkg-config library directory to be overridden. ++AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[ ++if test "$PKG_CONFIG" != none ; then ++ AC_MSG_CHECKING(for $PKG_CONFIG library directory) ++ AC_ARG_WITH(pkg-config-libdir, ++ [ --with-pkg-config-libdir=XXX use given directory for installing pc-files], ++ [PKG_CONFIG_LIBDIR=$withval], ++ [PKG_CONFIG_LIBDIR=yes]) ++ ++ case x$PKG_CONFIG_LIBDIR in #(vi ++ x/*) #(vi ++ ;; ++ xyes) #(vi ++ # look for the library directory using the same prefix as the executable ++ cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'` ++ case x`(arch) 2>/dev/null` in #(vi ++ *64) #(vi ++ for cf_config in $cf_path/share $cf_path/lib64 $cf_path/lib32 $cf_path/lib ++ do ++ if test -d $cf_config/pkgconfig ++ then ++ PKG_CONFIG_LIBDIR=$cf_config/pkgconfig ++ break ++ fi ++ done ++ ;; ++ *) ++ PKG_CONFIG_LIBDIR=$cf_path/lib/pkgconfig ++ ;; ++ esac ++ ;; ++ *) ++ ;; ++ esac ++ ++ AC_MSG_RESULT($PKG_CONFIG_LIBDIR) ++fi ++ ++AC_SUBST(PKG_CONFIG_LIBDIR) ++])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_WITH_PTHREAD version: 5 updated: 2011/12/10 19:01:56 + dnl --------------- + dnl Check for POSIX thread library. + AC_DEFUN([CF_WITH_PTHREAD], +@@ -6402,23 +6943,28 @@ + AC_CHECK_HEADER(pthread.h,[ + AC_DEFINE(HAVE_PTHREADS_H) + +- AC_MSG_CHECKING(if we can link with the pthread library) +- cf_save_LIBS="$LIBS" +- CF_ADD_LIB(pthread) +- AC_TRY_LINK([ ++ for cf_lib_pthread in pthread c_r ++ do ++ AC_MSG_CHECKING(if we can link with the $cf_lib_pthread library) ++ cf_save_LIBS="$LIBS" ++ CF_ADD_LIB($cf_lib_pthread) ++ AC_TRY_LINK([ + #include + ],[ +- int rc = pthread_create(0,0,0,0); ++ int rc = pthread_create(0,0,0,0); ++ int r2 = pthread_mutexattr_settype(0, 0); + ],[with_pthread=yes],[with_pthread=no]) +- LIBS="$cf_save_LIBS" +- AC_MSG_RESULT($with_pthread) ++ LIBS="$cf_save_LIBS" ++ AC_MSG_RESULT($with_pthread) ++ test "$with_pthread" = yes && break ++ done + +- if test "$with_pthread" = yes ; then +- CF_ADD_LIB(pthread) +- AC_DEFINE(HAVE_LIBPTHREADS) +- else +- AC_MSG_ERROR(Cannot link with pthread library) +- fi ++ if test "$with_pthread" = yes ; then ++ CF_ADD_LIB($cf_lib_pthread) ++ AC_DEFINE(HAVE_LIBPTHREADS) ++ else ++ AC_MSG_ERROR(Cannot link with pthread library) ++ fi + ]) + fi + ]) +@@ -6486,7 +7032,7 @@ + [USE_VALGRIND]) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37 ++dnl CF_XOPEN_SOURCE version: 42 updated: 2012/01/07 08:26:49 + 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, +@@ -6502,7 +7048,7 @@ + cf_xopen_source= + + case $host_os in #(vi +-aix[[456]]*) #(vi ++aix[[4-7]]*) #(vi + cf_xopen_source="-D_ALL_SOURCE" + ;; + cygwin) #(vi +@@ -6513,6 +7059,7 @@ + ;; + darwin*) #(vi + cf_xopen_source="-D_DARWIN_C_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + freebsd*|dragonfly*) #(vi + # 5.x headers associate +@@ -6530,15 +7077,23 @@ + ;; + irix[[56]].*) #(vi + cf_xopen_source="-D_SGI_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + linux*|gnu*|mint*|k*bsd*-gnu) #(vi + CF_GNU_SOURCE + ;; + mirbsd*) #(vi +- # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks ++ # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks and other headers which use u_int / u_short types ++ cf_XOPEN_SOURCE= ++ CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) + ;; + netbsd*) #(vi +- # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ++ cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ++ ;; ++openbsd[[4-9]]*) #(vi ++ # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw ++ cf_xopen_source="-D_BSD_SOURCE" ++ cf_XOPEN_SOURCE=600 + ;; + openbsd*) #(vi + # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw +@@ -6552,36 +7107,11 @@ + sco*) #(vi + # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer + ;; +-solaris2.1[[0-9]]) #(vi +- cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- ;; +-solaris2.[[1-9]]) #(vi ++solaris2.*) #(vi + cf_xopen_source="-D__EXTENSIONS__" + ;; + *) +- AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ +- AC_TRY_COMPILE([#include ],[ +-#ifndef _XOPEN_SOURCE +-make an error +-#endif], +- [cf_cv_xopen_source=no], +- [cf_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- AC_TRY_COMPILE([#include ],[ +-#ifdef _XOPEN_SOURCE +-make an error +-#endif], +- [cf_cv_xopen_source=no], +- [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) +- CPPFLAGS="$cf_save" +- ]) +-]) +- if test "$cf_cv_xopen_source" != no ; then +- CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) +- CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) +- cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" +- CF_ADD_CFLAGS($cf_temp_xopen_source) +- fi ++ CF_TRY_XOPEN_SOURCE + CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) + ;; + esac +@@ -6589,4 +7119,33 @@ + if test -n "$cf_xopen_source" ; then + CF_ADD_CFLAGS($cf_xopen_source) + fi ++ ++dnl In anything but the default case, we may have system-specific setting ++dnl which is still not guaranteed to provide all of the entrypoints that ++dnl _XOPEN_SOURCE would yield. ++if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then ++ AC_MSG_CHECKING(if _XOPEN_SOURCE really is set) ++ AC_TRY_COMPILE([#include ],[ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif], ++ [cf_XOPEN_SOURCE_set=yes], ++ [cf_XOPEN_SOURCE_set=no]) ++ AC_MSG_RESULT($cf_XOPEN_SOURCE_set) ++ if test $cf_XOPEN_SOURCE_set = yes ++ then ++ AC_TRY_COMPILE([#include ],[ ++#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE ++make an error ++#endif], ++ [cf_XOPEN_SOURCE_set_ok=yes], ++ [cf_XOPEN_SOURCE_set_ok=no]) ++ if test $cf_XOPEN_SOURCE_set_ok = no ++ then ++ AC_MSG_WARN(_XOPEN_SOURCE is lower than requested) ++ fi ++ else ++ CF_TRY_XOPEN_SOURCE ++ fi ++fi + ]) +diff -Naur ncurses-5.9.orig/announce.html.in ncurses-5.9/announce.html.in +--- ncurses-5.9.orig/announce.html.in 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/announce.html.in 2012-08-25 19:57:59.893231947 +0000 +@@ -1,6 +1,6 @@ + + + + +@@ -79,39 +79,57 @@ + bilities of entries for which a terminfo entry has been + compiled. + +- The tgetent routine loads the entry for name. It returns +- 1 on success, 0 if there is no such entry, and -1 if the +- terminfo database could not be found. The emulation ig- +- nores the buffer pointer bp. ++ The tgetent routine loads the entry for name. It returns: ++ ++ 1 on success, ++ ++ 0 if there is no such entry (or that it is a generic ++ type, having too little information for curses ap- ++ plications to run), and ++ ++ -1 if the terminfo database could not be found. ++ ++ This differs from the termcap library in two ways: ++ ++ - The emulation ignores the buffer pointer bp. The ++ termcap library would store a copy of the terminal ++ description in the area referenced by this pointer. ++ However, ncurses stores its terminal descriptions in ++ compiled binary form, which is not the same thing. ++ ++ - There is a difference in return codes. The termcap ++ library does not check if the terminal description ++ is marked with the generic capability, or if the ++ terminal description has cursor-addressing. + + The tgetflag routine gets the boolean entry for id, or ze- + ro if it is not available. + +- The tgetnum routine gets the numeric entry for id, or -1 ++ The tgetnum routine gets the numeric entry for id, or -1 + if it is not available. + +- The tgetstr routine returns the string entry for id, or +- zero if it is not available. Use tputs to output the re- +- turned string. The return value will also be copied to +- the buffer pointed to by area, and the area value will be ++ The tgetstr routine returns the string entry for id, or ++ zero if it is not available. Use tputs to output the re- ++ turned string. The return value will also be copied to ++ the buffer pointed to by area, and the area value will be + updated to point past the null ending this value. + + Only the first two characters of the id parameter of tget- + flag, tgetnum and tgetstr are compared in lookups. + +- The tgoto routine instantiates the parameters into the +- given capability. The output from this routine is to be ++ The tgoto routine instantiates the parameters into the ++ given capability. The output from this routine is to be + passed to tputs. + +- The tputs routine is described on the curs_terminfo(3x) ++ The tputs routine is described on the curs_terminfo(3x) + manual page. It can retrieve capabilities by either term- + cap or terminfo name. + + The variables PC, UP and BC are set by tgetent to the ter- + minfo entry's data for pad_char, cursor_up and +- backspace_if_not_bs, respectively. UP is not used by ++ backspace_if_not_bs, respectively. UP is not used by + ncurses. PC is used in the tdelay_output function. BC is +- used in the tgoto emulation. The variable ospeed is set ++ used in the tgoto emulation. The variable ospeed is set + by ncurses in a system-specific coding to reflect the ter- + minal speed. + +@@ -119,7 +137,7 @@ + +

RETURN VALUE

+        Except where explicitly noted, routines that return an in-
+-       teger  return ERR upon failure and OK (SVr4 only specifies
++       teger return ERR upon failure and OK (SVr4 only  specifies
+        "an integer value other than ERR") upon successful comple-
+        tion.
+ 
+@@ -129,48 +147,48 @@
+
+

BUGS

+        If you call tgetstr to fetch ca or any other parameterized
+-       string, be aware that it will be returned in terminfo  no-
++       string,  be aware that it will be returned in terminfo no-
+        tation, not the older and not-quite-compatible termcap no-
+-       tation.  This will not cause problems if all you  do  with
+-       it  is  call  tgoto  or tparm, which both expand terminfo-
+-       style strings as terminfo.  (The tgoto function,  if  con-
+-       figured  to  support  termcap, will check if the string is
+-       indeed terminfo-style by looking for  "%p"  parameters  or
+-       "$<..>"  delays,  and invoke a termcap-style parser if the
++       tation.   This  will not cause problems if all you do with
++       it is call tgoto or tparm,  which  both  expand  terminfo-
++       style  strings  as terminfo.  (The tgoto function, if con-
++       figured to support termcap, will check if  the  string  is
++       indeed  terminfo-style  by  looking for "%p" parameters or
++       "$<..>" delays, and invoke a termcap-style parser  if  the
+        string does not appear to be terminfo).
+ 
+-       Because terminfo conventions for representing  padding  in
+-       string  capabilities  differ  from termcap's, tputs("50");
+-       will put out a literal "50" rather than  busy-waiting  for
++       Because  terminfo  conventions for representing padding in
++       string capabilities differ  from  termcap's,  tputs("50");
++       will  put  out a literal "50" rather than busy-waiting for
+        50 milliseconds.  Cope with it.
+ 
+-       Note  that termcap has nothing analogous to terminfo's sgr
+-       string.  One consequence of this is that termcap  applica-
+-       tions  assume me (terminfo sgr0) does not reset the alter-
+-       nate character set.  This implementation checks  for,  and
++       Note that termcap has nothing analogous to terminfo's  sgr
++       string.   One consequence of this is that termcap applica-
++       tions assume me (terminfo sgr0) does not reset the  alter-
++       nate  character  set.  This implementation checks for, and
+        modifies the data shown to the termcap interface to accom-
+        modate termcap's limitation in this respect.
+ 
+ 
+
+

PORTABILITY

+-       The XSI Curses standard, Issue  4  describes  these  func-
+-       tions.   However,  they are marked TO BE WITHDRAWN and may
++       The  XSI  Curses  standard,  Issue 4 describes these func-
++       tions.  However, they are marked TO BE WITHDRAWN  and  may
+        be removed in future versions.
+ 
+-       Neither the XSI Curses standard nor  the  SVr4  man  pages
+-       documented  the return values of tgetent correctly, though
+-       all three were in fact returned ever since SVr1.  In  par-
+-       ticular,  an  omission in the XSI Curses documentation has
+-       been misinterpreted to mean that  tgetent  returns  OK  or
++       Neither  the  XSI  Curses  standard nor the SVr4 man pages
++       documented the return values of tgetent correctly,  though
++       all  three were in fact returned ever since SVr1.  In par-
++       ticular, an omission in the XSI Curses  documentation  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
++       compatibility  with  the termcap library, that is a defect
+        in XCurses, Issue 4, Version 2 rather than in ncurses.
+ 
+-       External  variables  are  provided  for support of certain
+-       termcap applications.  However, termcap applications'  use
++       External variables are provided  for  support  of  certain
++       termcap  applications.  However, termcap applications' use
+        of those variables is poorly documented, e.g., not distin-
+-       guishing between input and output.   In  particular,  some
++       guishing  between  input  and output.  In particular, some
+        applications are reported to declare and/or modify ospeed.
+ 
+ 
+diff -Naur ncurses-5.9.orig/doc/html/man/curs_terminfo.3x.html ncurses-5.9/doc/html/man/curs_terminfo.3x.html
+--- ncurses-5.9.orig/doc/html/man/curs_terminfo.3x.html	2012-08-25 19:57:59.359901137 +0000
++++ ncurses-5.9/doc/html/man/curs_terminfo.3x.html	2012-08-25 19:58:00.276563468 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+@@ -258,11 +258,11 @@
+ 
+        Routines that return pointers always return NULL on error.
+ 
+-       X/Open defines no error conditions.  In  this  implementa-
++       X/Open  defines  no error conditions.  In this implementa-
+        tion
+ 
+               del_curterm
+-                   returns  an error if its terminal parameter is
++                   returns an error if its terminal parameter  is
+                    null.
+ 
+               putp calls tputs, returning the same error-codes.
+@@ -272,23 +272,23 @@
+                    tupterm returns an error.
+ 
+               setupterm
+-                   returns  an error if it cannot allocate enough
++                   returns an error if it cannot allocate  enough
+                    memory, or create the initial windows (stdscr,
+-                   curscr,  newscr).   Other error conditions are
++                   curscr, newscr).  Other error  conditions  are
+                    documented above.
+ 
+               tputs
+-                   returns an error if the  string  parameter  is
+-                   null.   It  does not detect I/O errors: X/Open
+-                   states that tputs ignores the return value  of
++                   returns  an  error  if the string parameter is
++                   null.  It does not detect I/O  errors:  X/Open
++                   states  that tputs ignores the return value of
+                    the output function putc.
+ 
+ 
+
+

NOTES

+-       The  setupterm routine should be used in place of setterm.
+-       It may be useful when you want to test for terminal  capa-
+-       bilities  without  committing to the allocation of storage
++       The setupterm routine should be used in place of  setterm.
++       It  may be useful when you want to test for terminal capa-
++       bilities without committing to the allocation  of  storage
+        involved in initscr.
+ 
+        Note that vidattr and vidputs may be macros.
+@@ -296,58 +296,58 @@
+ 
+
+

PORTABILITY

+-       The function setterm is not described by X/Open  and  must
+-       be  considered  non-portable.   All other functions are as
++       The  function  setterm is not described by X/Open and must
++       be considered non-portable.  All other  functions  are  as
+        described by X/Open.
+ 
+-       setupterm copies the terminal name to the  array  ttytype.
+-       This  is not part of X/Open Curses, but is assumed by some
++       setupterm  copies  the terminal name to the array ttytype.
++       This is not part of X/Open Curses, but is assumed by  some
+        applications.
+ 
+-       In System V Release 4, set_curterm has an int return  type
+-       and  returns  OK  or ERR.  We have chosen to implement the
++       In  System V Release 4, set_curterm has an int return type
++       and returns OK or ERR.  We have chosen  to  implement  the
+        X/Open Curses semantics.
+ 
+        In System V Release 4, the third argument of tputs has the
+        type int (*putc)(char).
+ 
+        At least one implementation of X/Open Curses (Solaris) re-
+-       turns a value other than OK/ERR from tputs.  That  returns
++       turns  a value other than OK/ERR from tputs.  That returns
+        the length of the string, and does no error-checking.
+ 
+-       X/Open  Curses prototypes tparm with a fixed number of pa-
+-       rameters, rather than a variable argument list.  This  im-
+-       plementation  uses  a  variable  argument list, but can be
+-       configured to use the fixed-parameter list.  Portable  ap-
+-       plications  should  provide 9 parameters after the format;
++       X/Open Curses prototypes tparm with a fixed number of  pa-
++       rameters,  rather than a variable argument list.  This im-
++       plementation uses a variable argument  list,  but  can  be
++       configured  to use the fixed-parameter list.  Portable ap-
++       plications should provide 9 parameters after  the  format;
+        zeroes are fine for this purpose.
+ 
+        In response to comments by Thomas E. Dickey, X/Open Curses
+        Issue 7 proposed the tiparam function in mid-2009.
+ 
+-       X/Open  notes  that  after calling mvcur, the curses state
+-       may not match the actual terminal state, and that  an  ap-
+-       plication  should  touch and refresh the window before re-
++       X/Open notes that after calling mvcur,  the  curses  state
++       may  not  match the actual terminal state, and that an ap-
++       plication should touch and refresh the window  before  re-
+        suming normal curses calls.  Both ncurses and System V Re-
+        lease 4 curses implement mvcur using the SCREEN data allo-
+        cated in either initscr or newterm.  So though it is docu-
+-       mented  as  a  terminfo function, mvcur is really a curses
++       mented as a terminfo function, mvcur is  really  a  curses
+        function which is not well specified.
+ 
+-       X/Open states that the old  location  must  be  given  for
+-       mvcur.   This implementation allows the caller to use -1's
+-       for the old ordinates.  In that case, the old location  is
++       X/Open  states  that  the  old  location must be given for
++       mvcur.  This implementation allows the caller to use  -1's
++       for  the old ordinates.  In that case, the old location is
+        unknown.
+ 
+-       Extended  terminal  capability  names, e.g., as defined by
+-       tic -x, are not stored in the  arrays  described  in  this
++       Extended terminal capability names, e.g.,  as  defined  by
++       tic -x,  are  not  stored  in the arrays described in this
+        section.
+ 
+ 
+
+

SEE ALSO

+-       curses(3x),  curs_initscr(3x), curs_kernel(3x), curs_term-
+-       cap(3x), curs_variables(3x), term_variables(3x),  putc(3),
++       curses(3x), curs_initscr(3x), curs_kernel(3x),  curs_term-
++       cap(3x),  curs_variables(3x), term_variables(3x), putc(3),
+        terminfo(5)
+ 
+ 
+diff -Naur ncurses-5.9.orig/doc/html/man/curs_util.3x.html ncurses-5.9/doc/html/man/curs_util.3x.html
+--- ncurses-5.9.orig/doc/html/man/curs_util.3x.html	2012-08-25 19:57:59.359901137 +0000
++++ ncurses-5.9/doc/html/man/curs_util.3x.html	2012-08-25 19:58:00.276563468 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+diff -Naur ncurses-5.9.orig/doc/html/man/form.3x.html ncurses-5.9/doc/html/man/form.3x.html
+--- ncurses-5.9.orig/doc/html/man/form.3x.html	2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/form.3x.html	2012-08-25 19:58:00.276563468 +0000
+@@ -243,7 +243,7 @@
+ 
+
+

SEE ALSO

+-       This describes ncurses version 5.9 (patch 20110404).
++       This describes ncurses version 5.9 (patch 20120107).
+ 
+ 
+ 
+diff -Naur ncurses-5.9.orig/doc/html/man/infocmp.1m.html ncurses-5.9/doc/html/man/infocmp.1m.html
+--- ncurses-5.9.orig/doc/html/man/infocmp.1m.html	2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/infocmp.1m.html	2012-08-25 19:58:00.276563468 +0000
+@@ -2,7 +2,7 @@
+ 
+ 
+ 
+@@ -53,7 +53,7 @@
+ 
+
+

SYNOPSIS

+-       infocmp [-1CEFGILTUVcdegilnpqrtux]
++       infocmp [-1CDEFGIKLTUVcdegilnpqrtux]
+              [-v n] [-s d| i| l| c] [-R subset]
+              [-w width] [-A directory] [-B directory]
+              [termname...]
+@@ -107,6 +107,7 @@
+       -L   use the long C variable name listed in <term.h>
+       -C   use the termcap names
+       -r   when using -C, put out all capabilities in termcap form
++      -K   modifies the -C option, improving BSD-compatibility.
+ 
+        If  no  termnames are given, the environment variable TERM
+        will be used for the terminal name.
+@@ -129,7 +130,11 @@
+        only  those variables which were part of termcap will nor-
+        mally be output.  Specifying the -r option will  take  off
+        this  restriction,  allowing all capabilities to be output
+-       in termcap form.
++       in termcap form.  Normally you would use both the  -C  and
++       -r  options.   The  actual  format  used incorporates some
++       improvements for escaped characters from terminfo  format.
++       For  a  stricter  BSD-compatible  translation,  use the -K
++       option rather than -C.
+ 
+        Note that because padding is collected to the beginning of
+        the  capability,  not all capabilities are output.  Manda-
+@@ -173,9 +178,9 @@
+        termname  entries contains a value for it.  A capability's
+        value gets printed if the value in the first  termname  is
+        not  found in any of the other termname entries, or if the
+-       first of the other termname entries that has this capabil-
+-       ity  gives  a different value for the capability than that
+-       in the first termname.
++       first  of  the  other  termname  entries  that  has   this
++       capability gives a different value for the capability than
++       that in the first termname.
+ 
+        The order of the other termname  entries  is  significant.
+        Since  the terminfo compiler tic does a left-to-right scan
+@@ -214,14 +219,20 @@
+        different people.
+ 
+    Other Options
+-       -1   causes  the  fields  to be printed out one to a line.
+-            Otherwise, the fields will be printed  several  to  a
++       -0   causes  the fields to be printed on one line, without
++            wrapping.
++
++       -1   causes the fields to be printed out one  to  a  line.
++            Otherwise,  the  fields  will be printed several to a
+             line to a maximum width of 60 characters.
+ 
+-       -a   tells  infocmp  to  retain commented-out capabilities
+-            rather than discarding them.  Capabilities  are  com-
++       -a   tells infocmp to  retain  commented-out  capabilities
++            rather  than  discarding them.  Capabilities are com-
+             mented by prefixing them with a period.
+ 
++       -D   tells infocmp to print the database locations that it
++            knows about, and exit.
++
+        -E   Dump  the  capabilities  of  the  given  terminal  as
+             tables, needed in the C initializer  for  a  TERMTYPE
+             structure  (the  terminal capability structure in the
+@@ -233,8 +244,8 @@
+ 
+             Before ncurses 5.0, the split between the -e  and  -E
+             options  was  not  needed;  but  support for extended
+-            names required making the arrays of terminal capabil-
+-            ities separate from the TERMTYPE structure.
++            names  required  making  the   arrays   of   terminal
++            capabilities separate from the TERMTYPE structure.
+ 
+        -e   Dump  the  capabilities  of the given terminal as a C
+             initializer for a TERMTYPE  structure  (the  terminal
+@@ -299,6 +310,7 @@
+                   ISO US G1     enable US chars for G1
+                   -----------------------------------------
+                   DECPAM        application keypad mode
++
+                   DECPNM        normal keypad mode
+                   DECANSI       enter ANSI mode
+                   -----------------------------------------
+@@ -310,7 +322,6 @@
+                   DEC[+-]CKM    application cursor keys
+                   DEC[+-]ANM    set VT52 mode
+                   DEC[+-]COLM   132-column mode
+-
+                   DEC[+-]SCLM   smooth scroll
+                   DEC[+-]SCNM   reverse video mode
+                   DEC[+-]OM     origin mode
+@@ -404,12 +415,13 @@
+ 
+
+

EXTENSIONS

+-       The -E, -F, -G, -R, -T, -V, -a, -e, -f, -g, -i, -l, -p, -q
+-       and -t options are not supported in SVr4 curses.
++       The -0, -1, -E, -F, -G, -R, -T, -V, -a, -e,  -f,  -g,  -i,
++       -l,  -p,  -q  and  -t  options  are  not supported in SVr4
++       curses.
+ 
+        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
++       V  Release  4's.   Actual  BSD curses versions will have a
++       more restricted set.  To see only the 4.4BSD set,  use  -r
+        -RBSD.
+ 
+ 
+@@ -420,10 +432,10 @@
+ 
+
+

SEE ALSO

+-       captoinfo(1m),    infotocap(1m),     tic(1m),     toe(1m),
++       captoinfo(1m),     infotocap(1m),     tic(1m),    toe(1m),
+        curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 5.9 (patch 20110404).
++       This describes ncurses version 5.9 (patch 20120107).
+ 
+ 
+
+diff -Naur ncurses-5.9.orig/doc/html/man/infotocap.1m.html ncurses-5.9/doc/html/man/infotocap.1m.html +--- ncurses-5.9.orig/doc/html/man/infotocap.1m.html 2012-08-25 19:57:59.363234455 +0000 ++++ ncurses-5.9/doc/html/man/infotocap.1m.html 2012-08-25 19:58:00.276563468 +0000 +@@ -94,7 +94,7 @@ +

SEE ALSO

+        curses(3x), tic(1m), infocmp(1m), terminfo(5)
+ 
+-       This describes ncurses version 5.9 (patch 20110404).
++       This describes ncurses version 5.9 (patch 20120107).
+ 
+ 
+
+diff -Naur ncurses-5.9.orig/doc/html/man/menu.3x.html ncurses-5.9/doc/html/man/menu.3x.html +--- ncurses-5.9.orig/doc/html/man/menu.3x.html 2012-08-25 19:57:59.356567819 +0000 ++++ ncurses-5.9/doc/html/man/menu.3x.html 2012-08-25 19:58:00.279896785 +0000 +@@ -226,7 +226,7 @@ + + +

SEE ALSO

+-       This describes ncurses version 5.9 (patch 20110404).
++       This describes ncurses version 5.9 (patch 20120107).
+ 
+ 
+ 
+diff -Naur ncurses-5.9.orig/doc/html/man/ncurses.3x.html ncurses-5.9/doc/html/man/ncurses.3x.html
+--- ncurses-5.9.orig/doc/html/man/ncurses.3x.html	2012-08-25 19:57:59.359901137 +0000
++++ ncurses-5.9/doc/html/man/ncurses.3x.html	2012-08-25 19:58:00.279896785 +0000
+@@ -28,7 +28,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: ncurses.3x,v 1.103 2011/02/05 23:21:29 tom Exp @
++  * @Id: ncurses.3x,v 1.106 2011/12/17 23:19:59 tom Exp @
+ -->
+ 
+ 
+@@ -63,7 +63,7 @@
+        sonable   optimization.    This  implementation  is  ``new
+        curses'' (ncurses) and is  the  approved  replacement  for
+        4.4BSD  classic curses, which has been discontinued.  This
+-       describes ncurses version 5.9 (patch 20110404).
++       describes ncurses version 5.9 (patch 20120107).
+ 
+        The ncurses library emulates the curses library of  System
+        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
+@@ -757,9 +757,12 @@
+        pletion, unless otherwise noted in  the  routine  descrip-
+        tions.
+ 
+-       All  macros  return  the  value  of  the w version, except
++       As a general rule, routines check for null pointers passed
++       as parameters, and handle this as an error.
++
++       All macros return the  value  of  the  w  version,  except
+        setscrreg, wsetscrreg, getyx, getbegyx, and getmaxyx.  The
+-       return  values  of setscrreg, wsetscrreg, getyx, getbegyx,
++       return values of setscrreg, wsetscrreg,  getyx,  getbegyx,
+        and getmaxyx are undefined (i.e., these should not be used
+        as the right-hand side of assignment statements).
+ 
+@@ -773,46 +776,46 @@
+        important ones have been already discussed in detail.
+ 
+        BAUDRATE
+-            The  debugging library checks this environment symbol
++            The debugging library checks this environment  symbol
+             when the application has redirected output to a file.
+-            The  symbol's numeric value is used for the baudrate.
++            The symbol's numeric value is used for the  baudrate.
+             If no value is found, ncurses uses 9600.  This allows
+-            testers  to construct repeatable test-cases that take
++            testers to construct repeatable test-cases that  take
+             into account costs that depend on baudrate.
+ 
+        CC   When set, change occurrences of the command_character
+-            (i.e.,  the  cmdch capability) of the loaded terminfo
+-            entries to the value of this symbol.  Very  few  ter-
++            (i.e., the cmdch capability) of the  loaded  terminfo
++            entries  to  the value of this symbol.  Very few ter-
+             minfo entries provide this feature.
+ 
+-            Because  this  name is also used in development envi-
+-            ronments to represent the C compiler's name,  ncurses
++            Because this name is also used in  development  envi-
++            ronments  to represent the C compiler's name, ncurses
+             ignores it if it does not happen to be a single char-
+             acter.
+ 
+        COLUMNS
+             Specify  the  width  of  the  screen  in  characters.
+-            Applications  running in a windowing environment usu-
+-            ally are able to obtain the width of  the  window  in
+-            which  they  are  executing.   If neither the COLUMNS
+-            value nor the terminal's screen  size  is  available,
+-            ncurses  uses  the size which may be specified in the
++            Applications running in a windowing environment  usu-
++            ally  are  able  to obtain the width of the window in
++            which they are executing.   If  neither  the  COLUMNS
++            value  nor  the  terminal's screen size is available,
++            ncurses uses the size which may be specified  in  the
+             terminfo database (i.e., the cols capability).
+ 
+-            It is important that your application use  a  correct
+-            size  for  the  screen.   This is not always possible
+-            because your application may be  running  on  a  host
+-            which  does not honor NAWS (Negotiations About Window
+-            Size), or because  you  are  temporarily  running  as
+-            another  user.  However, setting COLUMNS and/or LINES
++            It  is  important that your application use a correct
++            size for the screen.  This  is  not  always  possible
++            because  your  application  may  be running on a host
++            which does not honor NAWS (Negotiations About  Window
++            Size),  or  because  you  are  temporarily running as
++            another user.  However, setting COLUMNS and/or  LINES
+             overrides  the  library's  use  of  the  screen  size
+             obtained from the operating system.
+ 
+-            Either  COLUMNS  or  LINES  symbols  may be specified
+-            independently.  This is mainly useful  to  circumvent
+-            legacy  misfeatures  of  terminal descriptions, e.g.,
++            Either COLUMNS or  LINES  symbols  may  be  specified
++            independently.   This  is mainly useful to circumvent
++            legacy misfeatures of  terminal  descriptions,  e.g.,
+             xterm which commonly specifies a 65 line screen.  For
+-            best  results, lines and cols should not be specified
++            best results, lines and cols should not be  specified
+             in a terminal description for terminals which are run
+             as emulations.
+ 
+@@ -821,35 +824,35 @@
+             the screen size.
+ 
+        ESCDELAY
+-            Specifies  the total time, in milliseconds, for which
+-            ncurses will await  a  character  sequence,  e.g.,  a
+-            function  key.  The default value, 1000 milliseconds,
++            Specifies the total time, in milliseconds, for  which
++            ncurses  will  await  a  character  sequence, e.g., a
++            function key.  The default value, 1000  milliseconds,
+             is enough for most uses.  However, it is made a vari-
+             able to accommodate unusual applications.
+ 
+             The most common instance where you may wish to change
+-            this value is to work with slow hosts, e.g.,  running
+-            on  a  network.   If  the host cannot read characters
+-            rapidly enough, it will have the same  effect  as  if
+-            the  terminal did not send characters rapidly enough.
++            this  value is to work with slow hosts, e.g., running
++            on a network.  If the  host  cannot  read  characters
++            rapidly  enough,  it  will have the same effect as if
++            the terminal did not send characters rapidly  enough.
+             The library will still see a timeout.
+ 
+-            Note that xterm mouse events are built up from  char-
+-            acter  sequences  received  from  the xterm.  If your
++            Note  that xterm mouse events are built up from char-
++            acter sequences received from  the  xterm.   If  your
+             application makes heavy use of multiple-clicking, you
+-            may  wish  to lengthen this default value because the
+-            timeout applies to the composed multi-click event  as
++            may wish to lengthen this default value  because  the
++            timeout  applies to the composed multi-click event as
+             well as the individual clicks.
+ 
+-            In  addition to the environment variable, this imple-
+-            mentation provides a global variable  with  the  same
++            In addition to the environment variable, this  imple-
++            mentation  provides  a  global variable with the same
+             name.  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  applica-
++            presence  of ESCDELAY in either form, but setting the
++            environment variable rather than the global  variable
++            does  not  create problems when compiling an applica-
+             tion.
+ 
+-       HOME Tells  ncurses where your home directory is.  That is
++       HOME Tells ncurses where your home directory is.  That  is
+             where  it  may  read  and  write  auxiliary  terminal
+             descriptions:
+ 
+@@ -857,12 +860,12 @@
+             $HOME/.terminfo
+ 
+        LINES
+-            Like  COLUMNS,  specify  the  height of the screen in
+-            characters.  See COLUMNS for a detailed  description.
++            Like COLUMNS, specify the height  of  the  screen  in
++            characters.   See COLUMNS for a detailed description.
+ 
+        MOUSE_BUTTONS_123
+             This applies only to the OS/2 EMX port.  It specifies
+-            the order of buttons on the mouse.   OS/2  numbers  a
++            the  order  of  buttons on the mouse.  OS/2 numbers a
+             3-button mouse inconsistently from other platforms:
+ 
+             1 = left
+@@ -870,109 +873,109 @@
+             3 = middle.
+ 
+             This symbol lets you customize the mouse.  The symbol
+-            must be three numeric digits 1-3 in any order,  e.g.,
+-            123  or  321.   If  it is not specified, ncurses uses
++            must  be three numeric digits 1-3 in any order, e.g.,
++            123 or 321.  If it is  not  specified,  ncurses  uses
+             132.
+ 
+        NCURSES_ASSUMED_COLORS
+-            Override the compiled-in assumption that  the  termi-
+-            nal's   default   colors   are   white-on-black  (see
+-            default_colors(3x)).  You may set the foreground  and
+-            background  color  values with this environment vari-
+-            able by proving a  2-element  list:  foreground,back-
+-            ground.   For  example, to tell ncurses to not assume
+-            anything about the colors, set this to  "-1,-1".   To
+-            make  it  green-on-black, set it to "2,0".  Any posi-
++            Override  the  compiled-in assumption that the termi-
++            nal's  default   colors   are   white-on-black   (see
++            default_colors(3x)).   You may set the foreground and
++            background color values with this  environment  vari-
++            able  by  proving  a 2-element list: foreground,back-
++            ground.  For example, to tell ncurses to  not  assume
++            anything  about  the colors, set this to "-1,-1".  To
++            make it green-on-black, set it to "2,0".   Any  posi-
+             tive value from zero to the terminfo max_colors value
+             is allowed.
+ 
+        NCURSES_GPM_TERMS
+-            This  applies  only  to ncurses configured to use the
++            This applies only to ncurses configured  to  use  the
+             GPM interface.
+ 
+             If present, the environment variable is a list of one
+-            or  more  terminal names against which the TERM envi-
+-            ronment variable is matched.  Setting it to an  empty
+-            value  disables the GPM interface; using the built-in
++            or more terminal names against which the  TERM  envi-
++            ronment  variable is matched.  Setting it to an empty
++            value disables the GPM interface; using the  built-in
+             support for xterm, etc.
+ 
+-            If the environment variable is absent,  ncurses  will
++            If  the  environment variable is absent, ncurses will
+             attempt to open GPM if TERM contains "linux".
+ 
+        NCURSES_NO_HARD_TABS
+-            Ncurses  may  use tabs as part of the cursor movement
+-            optimization.  In some cases,  your  terminal  driver
+-            may  not handle these properly.  Set this environment
++            Ncurses may use tabs as part of the  cursor  movement
++            optimization.   In  some  cases, your terminal driver
++            may not handle these properly.  Set this  environment
+             variable to disable the feature.  You can also adjust
+             your stty settings to avoid the problem.
+ 
+        NCURSES_NO_MAGIC_COOKIES
+             Some  terminals  use  a  magic-cookie  feature  which
+-            requires special handling to  make  highlighting  and
+-            other  video  attributes  display  properly.  You can
+-            suppress the highlighting entirely for  these  termi-
+-            nals by setting this environment variable.
++            requires  special  handling  to make highlighting and
++            other video attributes  display  properly.   You  can
++            suppress   the   highlighting   entirely   for  these
++            terminals by setting this environment variable.
+ 
+        NCURSES_NO_PADDING
+-            Most  of  the  terminal  descriptions in the terminfo
+-            database are written for real  "hardware"  terminals.
+-            Many  people  use  terminal  emulators which run in a
+-            windowing environment and use  curses-based  applica-
+-            tions.   Terminal  emulators can duplicate all of the
++            Most of the terminal  descriptions  in  the  terminfo
++            database  are  written for real "hardware" terminals.
++            Many people use terminal emulators  which  run  in  a
++            windowing  environment  and use curses-based applica-
++            tions.  Terminal emulators can duplicate all  of  the
+             important aspects of a hardware terminal, but they do
+-            not  have the same limitations.  The chief limitation
+-            of a hardware terminal from the  standpoint  of  your
++            not have the same limitations.  The chief  limitation
++            of  a  hardware  terminal from the standpoint of your
+             application is the management of dataflow, i.e., tim-
+             ing.  Unless a hardware terminal is interfaced into a
+-            terminal  concentrator  (which does flow control), it
+-            (or your application) must manage dataflow,  prevent-
+-            ing  overruns.   The  cheapest  solution (no hardware
++            terminal concentrator (which does flow  control),  it
++            (or  your application) must manage dataflow, prevent-
++            ing overruns.  The  cheapest  solution  (no  hardware
+             cost) is for your program to do this by pausing after
+-            operations  that  the  terminal  does slowly, such as
++            operations that the terminal  does  slowly,  such  as
+             clearing the display.
+ 
+-            As a result, many  terminal  descriptions  (including
+-            the  vt100)  have delay times embedded.  You may wish
+-            to use these descriptions, but not want  to  pay  the
++            As  a  result,  many terminal descriptions (including
++            the vt100) have delay times embedded.  You  may  wish
++            to  use  these  descriptions, but not want to pay the
+             performance penalty.
+ 
+-            Set  the NCURSES_NO_PADDING symbol to disable all but
+-            mandatory padding.  Mandatory padding is  used  as  a
++            Set the NCURSES_NO_PADDING symbol to disable all  but
++            mandatory  padding.   Mandatory  padding is used as a
+             part of special control sequences such as flash.
+ 
+        NCURSES_NO_SETBUF
+-            Normally  ncurses enables buffered output during ter-
+-            minal initialization.   This  is  done  (as  in  SVr4
+-            curses)  for  performance  reasons.  For testing pur-
++            Normally ncurses enables buffered output during  ter-
++            minal  initialization.   This  is  done  (as  in SVr4
++            curses) for performance reasons.   For  testing  pur-
+             poses, both of ncurses and certain applications, this
+             feature    is    made    optional.     Setting    the
+             NCURSES_NO_SETBUF variable disables output buffering,
+-            leaving  the  output  in  the  original (usually line
++            leaving the output  in  the  original  (usually  line
+             buffered) mode.
+ 
+        NCURSES_NO_UTF8_ACS
+             During initialization, the ncurses library checks for
+-            special  cases where VT100 line-drawing (and the cor-
+-            responding  alternate  character  set   capabilities)
+-            described  in  the  terminfo are known to be missing.
+-            Specifically, when running in  a  UTF-8  locale,  the
+-            Linux  console  emulator  and  the GNU screen program
+-            ignore these.  Ncurses checks  the  TERM  environment
+-            variable  for  these.   For  other special cases, you
+-            should set this  environment  variable.   Doing  this
+-            tells  ncurses to use Unicode values which correspond
++            special cases where VT100 line-drawing (and the  cor-
++            responding   alternate  character  set  capabilities)
++            described in the terminfo are known  to  be  missing.
++            Specifically,  when  running  in  a UTF-8 locale, the
++            Linux console emulator and  the  GNU  screen  program
++            ignore  these.   Ncurses  checks the TERM environment
++            variable for these.  For  other  special  cases,  you
++            should  set  this  environment  variable.  Doing this
++            tells ncurses to use Unicode values which  correspond
+             to the VT100 line-drawing glyphs.  That works for the
+             special cases cited, and is likely to work for termi-
+             nal emulators.
+ 
+-            When setting this variable, you should set  it  to  a
+-            nonzero  value.   Setting it to zero (or to a nonnum-
+-            ber) disables  the  special  check  for  "linux"  and
++            When  setting  this  variable, you should set it to a
++            nonzero value.  Setting it to zero (or to  a  nonnum-
++            ber)  disables  the  special  check  for  "linux" and
+             "screen".
+ 
+-            As   an  alternative  to  the  environment  variable,
+-            ncurses checks for an  extended  terminfo  capability
+-            U8.   This  is a numeric capability which can be com-
++            As  an  alternative  to  the  environment   variable,
++            ncurses  checks  for  an extended terminfo capability
++            U8.  This is a numeric capability which can  be  com-
+             piled using tic -x.  For example
+ 
+             # linux console, if patched to provide working
+@@ -985,43 +988,43 @@
+                                  U8#1, use=xterm,
+ 
+             The name "U8" is chosen to be two characters, to per-
+-            mit  it  to be used by applications that use ncurses'
++            mit it to be used by applications that  use  ncurses'
+             termcap interface.
+ 
+        NCURSES_TRACE
+-            During initialization, the ncurses debugging  library
+-            checks  the  NCURSES_TRACE symbol.  If it is defined,
++            During  initialization, the ncurses debugging library
++            checks the NCURSES_TRACE symbol.  If it  is  defined,
+             to a numeric value, ncurses calls the trace function,
+             using that value as the argument.
+ 
+-            The  argument  values, which are defined in curses.h,
+-            provide several types of information.   When  running
+-            with  traces enabled, your application will write the
++            The argument values, which are defined  in  curses.h,
++            provide  several  types of information.  When running
++            with traces enabled, your application will write  the
+             file trace to the current directory.
+ 
+-       TERM Denotes your terminal type.  Each  terminal  type  is
++       TERM Denotes  your  terminal  type.  Each terminal type is
+             distinct, though many are similar.
+ 
+        TERMCAP
+             If the ncurses library has been configured with term-
+-            cap support, ncurses  will  check  for  a  terminal's
++            cap  support,  ncurses  will  check  for a terminal's
+             description in termcap form if it is not available in
+             the terminfo database.
+ 
+-            The  TERMCAP  symbol  contains  either   a   terminal
+-            description  (with  newlines stripped out), or a file
+-            name telling where the  information  denoted  by  the
+-            TERM  symbol  exists.   In  either  case,  setting it
+-            directs ncurses to ignore the usual  place  for  this
++            The   TERMCAP   symbol  contains  either  a  terminal
++            description (with newlines stripped out), or  a  file
++            name  telling  where  the  information denoted by the
++            TERM symbol  exists.   In  either  case,  setting  it
++            directs  ncurses  to  ignore the usual place for this
+             information, e.g., /etc/termcap.
+ 
+        TERMINFO
+             Overrides the directory in which ncurses searches for
+             your terminal description.  This is the simplest, but
+-            not  the  only way to change the list of directories.
++            not the only way to change the list  of  directories.
+             The complete list of directories in order follows:
+ 
+-            o   the last directory to  which  ncurses  wrote,  if
++            o   the  last  directory  to  which ncurses wrote, if
+                 any, is searched first
+ 
+             o   the directory specified by the TERMINFO symbol
+@@ -1030,62 +1033,70 @@
+ 
+             o   directories listed in the TERMINFO_DIRS symbol
+ 
+-            o   one  or  more directories whose names are config-
++            o   one or more directories whose names  are  config-
+                 ured and compiled into the ncurses library, e.g.,
+                 /usr/share/terminfo
+ 
+        TERMINFO_DIRS
+-            Specifies  a list of directories to search for termi-
+-            nal descriptions.  The list is  separated  by  colons
+-            (i.e.,  ":") on Unix, semicolons on OS/2 EMX.  All of
++            Specifies a list of directories to search for  termi-
++            nal  descriptions.   The  list is separated by colons
++            (i.e., ":") on Unix, semicolons on OS/2 EMX.  All  of
+             the terminal descriptions are in terminfo form, which
+-            makes  a  subdirectory  named for the first letter of
++            makes a subdirectory named for the  first  letter  of
+             the terminal names therein.
+ 
++            If ncurses is built with a hashed database, then each
++            entry in this list can also be the path of the corre-
++            sponding database file.
++
++            If  ncurses is built with a support for reading term-
++            cap files directly, then an entry in this list may be
++            the path of a termcap file.
++
+        TERMPATH
+-            If TERMCAP does not hold a  file  name  then  ncurses
+-            checks  the TERMPATH symbol.  This is a list of file-
+-            names separated by spaces or colons  (i.e.,  ":")  on
++            If  TERMCAP  does  not  hold a file name then ncurses
++            checks the TERMPATH symbol.  This is a list of  file-
++            names  separated  by  spaces or colons (i.e., ":") on
+             Unix, semicolons on OS/2 EMX.  If the TERMPATH symbol
+-            is not set, ncurses looks in the files  /etc/termcap,
+-            /usr/share/misc/termcap  and  $HOME/.termcap, in that
++            is  not set, ncurses looks in the files /etc/termcap,
++            /usr/share/misc/termcap and $HOME/.termcap,  in  that
+             order.
+ 
+-       The library may be configured to disregard  the  following
+-       variables  when  the current user is the superuser (root),
+-       or if the application uses setuid or  setgid  permissions:
++       The  library  may be configured to disregard the following
++       variables when the current user is the  superuser  (root),
++       or  if  the application uses setuid or setgid permissions:
+        $TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME.
+ 
+ 
+
+

ALTERNATE CONFIGURATIONS

+-       Several  different  configurations are possible, depending
+-       on  the  configure  script  options  used  when   building
+-       ncurses.   There  are a few main options whose effects are
++       Several different configurations are  possible,  depending
++       on   the  configure  script  options  used  when  building
++       ncurses.  There are a few main options whose  effects  are
+        visible to the applications developer using ncurses:
+ 
+        --disable-overwrite
+-            The standard include for ncurses is as noted in  SYN-
++            The  standard include for ncurses is as noted in SYN-
+             OPSIS:
+ 
+             #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,
++            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.,
+ 
+             #include <ncurses/curses.h>
+ 
+-            It  also  omits a symbolic link which would allow you
++            It also omits a symbolic link which would  allow  you
+             to use -lcurses to build executables.
+ 
+        --enable-widec
+-            The configure script renames the library and (if  the
+-            --disable-overwrite  option  is used) puts the header
++            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.,
++            library names have a  "w"  appended  to  them,  i.e.,
+             instead of
+ 
+             -lncurses
+@@ -1095,16 +1106,16 @@
+             -lncursesw
+ 
+             You must also define _XOPEN_SOURCE_EXTENDED when com-
+-            piling  for  the  wide-character  library  to use the
+-            extended (wide-character)  functions.   The  curses.h
+-            file   which  is  installed  for  the  wide-character
+-            library is designed to be compatible with the  normal
++            piling for the  wide-character  library  to  use  the
++            extended  (wide-character)  functions.   The curses.h
++            file  which  is  installed  for  the   wide-character
++            library  is designed to be compatible with the normal
+             library's header.  Only the size of the WINDOW struc-
+-            ture differs, and very few applications require  more
+-            than  a  pointer  to  WINDOWs.   If  the  headers are
+-            installed  allowing  overwrite,  the   wide-character
+-            library's  headers should be installed last, to allow
+-            applications to be built using  either  library  from
++            ture  differs, and very few applications require more
++            than a  pointer  to  WINDOWs.   If  the  headers  are
++            installed   allowing  overwrite,  the  wide-character
++            library's headers should be installed last, to  allow
++            applications  to  be  built using either library from
+             the same set of headers.
+ 
+        --with-shared
+@@ -1114,16 +1125,16 @@
+        --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,
++            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-trace
+-            The  trace  function  normally  resides  in the debug
++            The trace function  normally  resides  in  the  debug
+             library, but it is sometimes useful to configure this
+-            in  the  shared  library.   Configure  scripts should
++            in the  shared  library.   Configure  scripts  should
+             check for the function's existence rather than assum-
+             ing it is always in the debug library.
+ 
+@@ -1131,14 +1142,14 @@
+
+

FILES

+        /usr/share/tabset
+-            directory  containing  initialization  files  for the
++            directory containing  initialization  files  for  the
+             terminal capability database /usr/share/terminfo ter-
+             minal capability database
+ 
+ 
+
+

SEE ALSO

+-       terminfo(5)  and  related  pages whose names begin "curs_"
++       terminfo(5) and related pages whose  names  begin  "curs_"
+        for detailed routine descriptions.
+        curs_variables(3x)
+ 
+@@ -1148,52 +1159,61 @@
+        The  ncurses  library  can  be  compiled  with  an  option
+        (-DUSE_GETCAP) that falls back to the old-style /etc/term-
+        cap file if the terminal setup code cannot find a terminfo
+-       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 significant cost
++       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 significant  cost
+        in core and startup cycles.
+ 
+-       The ncurses  library  includes  facilities  for  capturing
+-       mouse  events on certain terminals (including xterm).  See
++       The  ncurses  library  includes  facilities  for capturing
++       mouse events on certain terminals (including xterm).   See
+        the curs_mouse(3x) manual page for details.
+ 
+-       The ncurses library includes facilities for responding  to
+-       window  resizing  events,  e.g., when running in an xterm.
+-       See the resizeterm(3x) and wresize(3x)  manual  pages  for
+-       details.   In addition, the library may be configured with
++       The  ncurses library includes facilities for responding to
++       window resizing events, e.g., when running  in  an  xterm.
++       See  the  resizeterm(3x)  and wresize(3x) manual pages for
++       details.  In addition, the library may be configured  with
+        a SIGWINCH handler.
+ 
+-       The ncurses library extends the fixed set of function  key
+-       capabilities  of  terminals  by  allowing  the application
+-       designer to define additional key  sequences  at  runtime.
++       The  ncurses library extends the fixed set of function key
++       capabilities of  terminals  by  allowing  the  application
++       designer  to  define  additional key sequences at runtime.
+        See the define_key(3x) key_defined(3x), and keyok(3x) man-
+        ual pages for details.
+ 
+        The ncurses library can exploit the capabilities of termi-
+-       nals  which  implement the ISO-6429 SGR 39 and SGR 49 con-
++       nals which implement the ISO-6429 SGR 39 and SGR  49  con-
+        trols, which allow an application to reset the terminal to
+-       its  original  foreground and background colors.  From the
+-       users' perspective, the application is able to  draw  col-
+-       ored  text  on  a  background  whose color is set indepen-
+-       dently, providing better  control  over  color  contrasts.
++       its original foreground and background colors.   From  the
++       users'  perspective,  the application is able to draw col-
++       ored text on a background  whose  color  is  set  indepen-
++       dently,  providing  better  control  over color contrasts.
+        See the default_colors(3x) manual page for details.
+ 
+-       The  ncurses  library  includes  a  function for directing
+-       application output to a printer attached to  the  terminal
++       The ncurses library  includes  a  function  for  directing
++       application  output  to a printer attached to the terminal
+        device.  See the curs_print(3x) manual page for details.
+ 
+ 
+
+

PORTABILITY

+-       The  ncurses  library is intended to be BASE-level confor-
++       The ncurses library is intended to be  BASE-level  confor-
+        mant with XSI Curses.  The EXTENDED XSI Curses functional-
+        ity (including color support) is supported.
+ 
+-       A  small  number of local differences (that is, individual
+-       differences between the XSI Curses and ncurses calls)  are
+-       described  in  PORTABILITY  sections  of  the  library man
++       A small number of local differences (that  is,  individual
++       differences  between the XSI Curses and ncurses calls) are
++       described in  PORTABILITY  sections  of  the  library  man
+        pages.
+ 
++       Unlike  other  implementations, this one checks parameters
++       such as pointers to WINDOW structures to ensure  they  are
++       not  null.  The main reason for providing this behavior is
++       to guard against programmer error.  The standard interface
++       does not provide a way for the library to tell an applica-
++       tion which  of  several  possible  errors  were  detected.
++       Relying  on  this (or some other) extension will adversely
++       affect the portability of curses applications.
++
+        This implementation also contains several extensions:
+ 
+        o   The routine has_key is not part of  XPG4,  nor  is  it
+diff -Naur ncurses-5.9.orig/doc/html/man/ncurses5-config.1.html ncurses-5.9/doc/html/man/ncurses5-config.1.html
+--- ncurses-5.9.orig/doc/html/man/ncurses5-config.1.html	2012-08-25 19:57:59.359901137 +0000
++++ ncurses-5.9/doc/html/man/ncurses5-config.1.html	2012-08-25 19:58:00.279896785 +0000
+@@ -105,7 +105,8 @@
+ 
+        --terminfo-dirs
+               echos the $TERMINFO_DIRS directory list, e.g.,
+-              /usr/local/ncurses/lib/terminfo:/usr/share/terminfo
++              /usr/local/ncurses/share/terminfo:/usr/share/ter-
++              minfo
+ 
+        --termpath
+               echos  the  $TERMPATH  termcap list, if support for
+@@ -118,7 +119,7 @@
+ 
SEE ALSO
+        curses(3x)
+ 
+-       This describes ncurses version 5.9 (patch 20110404).
++       This describes ncurses version 5.9 (patch 20120107).
+ 
+ 
+ 
+diff -Naur ncurses-5.9.orig/doc/html/man/panel.3x.html ncurses-5.9/doc/html/man/panel.3x.html
+--- ncurses-5.9.orig/doc/html/man/panel.3x.html	2012-08-25 19:57:59.359901137 +0000
++++ ncurses-5.9/doc/html/man/panel.3x.html	2012-08-25 19:58:00.283230103 +0000
+@@ -218,7 +218,7 @@
+ 
SEE ALSO
+        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 5.9 (patch 20110404).
++       This describes ncurses version 5.9 (patch 20120107).
+ 
+ 
+ 

+diff -Naur ncurses-5.9.orig/doc/html/man/tabs.1.html ncurses-5.9/doc/html/man/tabs.1.html
+--- ncurses-5.9.orig/doc/html/man/tabs.1.html	2012-08-25 19:57:59.356567819 +0000
++++ ncurses-5.9/doc/html/man/tabs.1.html	2012-08-25 19:58:00.283230103 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+@@ -156,7 +156,7 @@
+ 
SEE ALSO
+        tset(1), infocmp(1m), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 5.9 (patch 20110404).
++       This describes ncurses version 5.9 (patch 20120107).
+ 
+ 
+ 
+diff -Naur ncurses-5.9.orig/doc/html/man/term.7.html ncurses-5.9/doc/html/man/term.7.html
+--- ncurses-5.9.orig/doc/html/man/term.7.html	2012-08-25 19:57:59.356567819 +0000
++++ ncurses-5.9/doc/html/man/term.7.html	2012-08-25 19:58:00.283230103 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+diff -Naur ncurses-5.9.orig/doc/html/man/term_variables.3x.html ncurses-5.9/doc/html/man/term_variables.3x.html
+--- ncurses-5.9.orig/doc/html/man/term_variables.3x.html	2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/term_variables.3x.html	2012-08-25 19:58:00.283230103 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+diff -Naur ncurses-5.9.orig/doc/html/man/terminfo.5.html ncurses-5.9/doc/html/man/terminfo.5.html
+--- ncurses-5.9.orig/doc/html/man/terminfo.5.html	2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/terminfo.5.html	2012-08-25 19:58:00.286563421 +0000
+@@ -34,7 +34,7 @@
+   ****************************************************************************
+   * @Id: terminfo.head,v 1.18 2010/07/31 16:08:48 tom Exp @
+   * Head of terminfo man page ends here
+-  * @Id: terminfo.tail,v 1.53 2010/12/04 18:38:55 tom Exp @
++  * @Id: terminfo.tail,v 1.55 2011/12/17 23:19:59 tom Exp @
+   * Beginning of terminfo.tail file
+   * This file is part of ncurses.
+   * See "terminfo.head" for copyright.
+@@ -78,7 +78,7 @@
+        nals by giving a set of capabilities which they  have,  by
+        specifying how to perform screen operations, and by speci-
+        fying padding requirements and  initialization  sequences.
+-       This describes ncurses version 5.9 (patch 20110404).
++       This describes ncurses version 5.9 (patch 20120107).
+ 
+        Entries in terminfo consist of a sequence of `,' separated
+        fields (embedded commas may be escaped with a backslash or
+@@ -989,13 +989,14 @@
+                                                bottom margins to
+                                                #1, #2
+ 
+-        The XSI Curses  standard  added  these.   They  are  some
+-        post-4.1  versions  of System V curses, e.g., Solaris 2.5
+-        and IRIX 6.x.  The ncurses termcap  names  for  them  are
+-        invented; according to the XSI Curses standard, they have
+-        no termcap names.  If your compiled terminfo entries  use
+-        these,  they  may  not be binary-compatible with System V
+-        terminfo entries after SVr4.1; beware!
++        The XSI Curses standard added  these  hardcopy  capabili-
++        ties.  They were used in some post-4.1 versions of System
++        V curses, e.g., Solaris 2.5 and IRIX 6.x.  Except for YI,
++        the ncurses termcap names for them are invented.  Accord-
++        ing to the XSI Curses  standard,  they  have  no  termcap
++        names.  If your compiled terminfo entries use these, they
++        may not  be  binary-compatible  with  System  V  terminfo
++        entries after SVr4.1; beware!
+ 
+ 
+                 Variable         Cap-   TCap     Description
+@@ -1015,13 +1016,15 @@
+         set_a_attributes         sgr1   sA   Define second set of
+                                              video attributes
+                                              #1-#6
+-        set_pglen_inch           slengthsL   YI Set page length
+-                                             to #1 hundredth of
+-                                             an inch
++        set_pglen_inch           slengthYI   Set page length to
++                                             #1 hundredth of an
++                                             inch (some implemen-
++                                             tations use sL for
++                                             termcap).
+ 
+    A Sample Entry
+        The following entry, describing an ANSI-standard terminal,
+-       is  representative  of  what a terminfo entry for a modern
++       is representative of what a terminfo entry  for  a  modern
+        terminal typically looks like.
+ 
+      ansi|ansi/pc-term compatible with color,
+@@ -1045,180 +1048,181 @@
+              sgr0=\E[0;10m, tbc=\E[2g, u6=\E[%d;%dR, u7=\E[6n,
+              u8=\E[?%[;0123456789]c, u9=\E[c, vpa=\E[%p1%dd,
+ 
+-       Entries may continue onto multiple lines by placing  white
+-       space  at  the  beginning  of  each line except the first.
+-       Comments may be included on lines  beginning  with  ``#''.
++       Entries  may continue onto multiple lines by placing white
++       space at the beginning of  each  line  except  the  first.
++       Comments  may  be  included on lines beginning with ``#''.
+        Capabilities in terminfo are of three types: Boolean capa-
+        bilities which indicate that the terminal has some partic-
+-       ular  feature, numeric capabilities giving the size of the
+-       terminal or the size  of  particular  delays,  and  string
+-       capabilities,  which  give a sequence which can be used to
++       ular feature, numeric capabilities giving the size of  the
++       terminal  or  the  size  of  particular delays, and string
++       capabilities, which give a sequence which can be  used  to
+        perform particular terminal operations.
+ 
+ 
+    Types of Capabilities
+-       All capabilities have names.  For instance, the fact  that
+-       ANSI-standard  terminals  have automatic margins (i.e., an
+-       automatic return and line-feed when the end of a  line  is
+-       reached)  is  indicated  by  the capability am.  Hence the
++       All  capabilities have names.  For instance, the fact that
++       ANSI-standard terminals have automatic margins  (i.e.,  an
++       automatic  return  and line-feed when the end of a line is
++       reached) is indicated by the  capability  am.   Hence  the
+        description of ansi includes am.  Numeric capabilities are
+-       followed  by  the character `#' and then a positive value.
+-       Thus cols, which indicates the number of columns the  ter-
+-       minal  has,  gives  the  value  `80' for ansi.  Values for
++       followed by the character `#' and then a  positive  value.
++       Thus  cols, which indicates the number of columns the ter-
++       minal has, gives the value  `80'  for  ansi.   Values  for
+        numeric capabilities may be specified in decimal, octal or
+-       hexadecimal,  using the C programming language conventions
++       hexadecimal, using the C programming language  conventions
+        (e.g., 255, 0377 and 0xff or 0xFF).
+ 
+-       Finally, string valued capabilities, such as el (clear  to
++       Finally,  string valued capabilities, such as el (clear to
+        end of line sequence) are given by the two-character code,
+-       an `=', and then a string ending  at  the  next  following
++       an  `=',  and  then  a string ending at the next following
+        `,'.
+ 
+-       A  number  of  escape sequences are provided in the string
++       A number of escape sequences are provided  in  the  string
+        valued capabilities for easy encoding of characters there.
+-       Both  \E  and  \e map to an ESCAPE character, ^x maps to a
+-       control-x for any appropriate x, and the sequences  \n  \l
+-       \r  \t  \b  \f  \s give a newline, line-feed, return, tab,
++       Both \E and \e map to an ESCAPE character, ^x  maps  to  a
++       control-x  for  any appropriate x, and the sequences \n \l
++       \r \t \b \f \s give a  newline,  line-feed,  return,  tab,
+        backspace, form-feed, and space.  Other escapes include \^
+-       for  ^, \\ for \, \, for comma, \: for :, and \0 for null.
+-       (\0 will produce \200, which does not terminate  a  string
++       for ^, \\ for \, \, for comma, \: for :, and \0 for  null.
++       (\0  will  produce \200, which does not terminate a string
+        but behaves as a null character on most terminals, provid-
+-       ing CS7 is specified.  See stty(1).)  Finally,  characters
++       ing  CS7 is specified.  See stty(1).)  Finally, characters
+        may be given as three octal digits after a \.
+ 
+-       A  delay  in  milliseconds may appear anywhere in a string
+-       capability, enclosed in $<..> brackets, as in  el=\EK$<5>,
+-       and  padding  characters  are supplied by tputs to provide
+-       this delay.  The delay must be a number with at  most  one
++       A delay in milliseconds may appear anywhere  in  a  string
++       capability,  enclosed in $<..> brackets, as in el=\EK$<5>,
++       and padding characters are supplied by  tputs  to  provide
++       this  delay.   The delay must be a number with at most one
+        decimal place of precision; it may be followed by suffixes
+-       `*' or '/' or both.  A  `*'  indicates  that  the  padding
+-       required  is  proportional to the number of lines affected
+-       by the  operation,  and  the  amount  given  is  the  per-
+-       affected-unit  padding  required.   (In the case of insert
++       `*'  or  '/'  or  both.   A `*' indicates that the padding
++       required is proportional to the number of  lines  affected
++       by  the  operation,  and  the  amount  given  is  the per-
++       affected-unit padding required.  (In the  case  of  insert
+        character,  the  factor  is  still  the  number  of  lines
+-       affected.)   Normally,  padding  is advisory if the device
+-       has the xon capability; it is used  for  cost  computation
+-       but  does not trigger delays.  A `/' suffix indicates that
+-       the padding is mandatory and forces a delay of  the  given
+-       number  of  milliseconds  even on devices for which xon is
++       affected.)  Normally, padding is advisory  if  the  device
++       has  the  xon  capability; it is used for cost computation
++       but does not trigger delays.  A `/' suffix indicates  that
++       the  padding  is mandatory and forces a delay of the given
++       number of milliseconds even on devices for  which  xon  is
+        present to indicate flow control.
+ 
+-       Sometimes individual capabilities must be  commented  out.
+-       To  do this, put a period before the capability name.  For
++       Sometimes  individual  capabilities must be commented out.
++       To do this, put a period before the capability name.   For
+        example, see the second ind in the example above.
+ 
+ 
+    Fetching Compiled Descriptions
+-       If the environment variable TERMINFO is set, it is  inter-
+-       preted  as the pathname of a directory containing the com-
++       If  the environment variable TERMINFO is set, it is inter-
++       preted as the pathname of a directory containing the  com-
+        piled description you are working on.  Only that directory
+        is searched.
+ 
+-       If  TERMINFO  is  not set, the ncurses version of the ter-
+-       minfo reader code  will  instead  look  in  the  directory
+-       $HOME/.terminfo  for  a compiled description.  If it fails
+-       to find one  there,  and  the  environment  variable  TER-
+-       MINFO_DIRS  is set, it will interpret the contents of that
+-       variable as a list of colon- separated directories  to  be
+-       searched  (an  empty  entry is interpreted as a command to
+-       search /usr/share/terminfo).  If no description  is  found
+-       in  any of the TERMINFO_DIRS directories, the fetch fails.
++       If TERMINFO is not set, the ncurses version  of  the  ter-
++       minfo  reader  code  will  instead  look  in the directory
++       $HOME/.terminfo for a compiled description.  If  it  fails
++       to  find  one  there,  and  the  environment variable TER-
++       MINFO_DIRS is set, it will interpret the contents of  that
++       variable  as  a  list  of colon- separated directories (or
++       database files) to be searched (an empty entry  is  inter-
++       preted as a command to search /usr/share/terminfo).  If no
++       description is found in any of the TERMINFO_DIRS  directo-
++       ries, the fetch fails.
+ 
+-       If neither TERMINFO nor TERMINFO_DIRS  is  set,  the  last
+-       place   tried  will  be  the  system  terminfo  directory,
++       If  neither  TERMINFO  nor  TERMINFO_DIRS is set, the last
++       place  tried  will  be  the  system  terminfo   directory,
+        /usr/share/terminfo.
+ 
+-       (Neither the  $HOME/.terminfo  lookups  nor  TERMINFO_DIRS
+-       extensions   are  supported  under  stock  System  V  ter-
++       (Neither  the  $HOME/.terminfo  lookups  nor TERMINFO_DIRS
++       extensions  are  supported  under  stock  System  V   ter-
+        minfo/curses.)
+ 
+ 
+    Preparing Descriptions
+-       We now outline how to prepare descriptions  of  terminals.
+-       The  most  effective way to prepare a terminal description
+-       is by imitating the description of a similar  terminal  in
+-       terminfo  and  to  build up a description gradually, using
++       We  now  outline how to prepare descriptions of terminals.
++       The most effective way to prepare a  terminal  description
++       is  by  imitating the description of a similar terminal in
++       terminfo and to build up a  description  gradually,  using
+        partial descriptions with vi or some other screen-oriented
+-       program  to  check that they are correct.  Be aware that a
++       program to check that they are correct.  Be aware  that  a
+        very unusual terminal may expose deficiencies in the abil-
+-       ity  of  the  terminfo  file to describe it or bugs in the
++       ity of the terminfo file to describe it  or  bugs  in  the
+        screen-handling code of the test program.
+ 
+-       To get the padding for insert line right (if the  terminal
++       To  get the padding for insert line right (if the terminal
+        manufacturer did not document it) a severe test is to edit
+-       a large file at 9600 baud, delete 16 or so lines from  the
+-       middle  of  the screen, then hit the `u' key several times
+-       quickly.  If the terminal messes up, more padding is  usu-
+-       ally  needed.  A similar test can be used for insert char-
++       a  large file at 9600 baud, delete 16 or so lines from the
++       middle of the screen, then hit the `u' key  several  times
++       quickly.   If the terminal messes up, more padding is usu-
++       ally needed.  A similar test can be used for insert  char-
+        acter.
+ 
+ 
+    Basic Capabilities
+-       The number of columns on each line  for  the  terminal  is
+-       given  by the cols numeric capability.  If the terminal is
+-       a CRT, then the number of lines on the screen is given  by
++       The  number  of  columns  on each line for the terminal is
++       given by the cols numeric capability.  If the terminal  is
++       a  CRT, then the number of lines on the screen is given by
+        the lines capability.  If the terminal wraps around to the
+-       beginning of the next line when it reaches the right  mar-
++       beginning  of the next line when it reaches the right mar-
+        gin, then it should have the am capability.  If the termi-
+-       nal can clear its screen, leaving the cursor in  the  home
+-       position,  then this is given by the clear string capabil-
+-       ity.  If the terminal overstrikes (rather than clearing  a
+-       position  when  a character is struck over) then it should
+-       have the os capability.  If the  terminal  is  a  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
++       nal  can  clear its screen, leaving the cursor in the home
++       position, then this is given by the clear string  capabil-
++       ity.   If the terminal overstrikes (rather than clearing a
++       position when a character is struck over) then  it  should
++       have  the  os  capability.   If the terminal is a 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 car-
+-       riage return, control M.)  If there is a code  to  produce
++       riage  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 to move to the right, up, and
++       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 to move to the right,  up,  and
+        down should be given as cuf1, cuu1, and cud1.  These local
+-       cursor  motions  should not alter the text they pass over,
+-       for example, you would not normally use  `cuf1= '  because
++       cursor motions should not alter the text they  pass  over,
++       for  example,  you would not normally use `cuf1= ' because
+        the space would erase the character moved over.
+ 
+-       A  very  important  point  here  is  that the local cursor
+-       motions encoded in terminfo are undefined at the left  and
+-       top  edges  of  a  CRT  terminal.   Programs  should never
+-       attempt to backspace around the left edge,  unless  bw  is
++       A very important point  here  is  that  the  local  cursor
++       motions  encoded in terminfo are undefined at the left and
++       top edges  of  a  CRT  terminal.   Programs  should  never
++       attempt  to  backspace  around the left edge, unless bw is
+        given, and never attempt to go up locally off the top.  In
+-       order to scroll text up, a program will go to  the  bottom
++       order  to  scroll text up, a program will go to the bottom
+        left corner of the screen and send the ind (index) string.
+ 
+        To scroll text down, a program goes to the top left corner
+-       of  the  screen  and  sends the ri (reverse index) string.
+-       The strings ind and ri are undefined  when  not  on  their
++       of the screen and sends the  ri  (reverse  index)  string.
++       The  strings  ind  and  ri are undefined when not on their
+        respective corners of the screen.
+ 
+        Parameterized versions of the scrolling sequences are indn
+        and rin which have the same semantics as ind and ri except
+-       that  they take one parameter, and scroll that many lines.
+-       They are also undefined except at the appropriate edge  of
++       that they take one parameter, and scroll that many  lines.
++       They  are also undefined except at the appropriate edge of
+        the screen.
+ 
+-       The  am  capability tells whether the cursor sticks at the
+-       right edge of the screen when text  is  output,  but  this
++       The am capability tells whether the cursor sticks  at  the
++       right  edge  of  the  screen when text is output, but this
+        does not necessarily apply to a 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,  the effect is undefined.  This is useful for draw-
+-       ing 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;  i.e.,  am.
+-       If  the  terminal  has  a command which moves to the first
+-       column of the next line, that command can be given as  nel
+-       (newline).   It  does not matter if the command clears the
+-       remainder of the current line, so if the terminal  has  no
+-       cr  and lf it may still be possible to craft a working nel
++       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, the effect is undefined.  This is useful for  draw-
++       ing  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; i.e., am.
++       If the terminal has a command which  moves  to  the  first
++       column  of the next line, that command can be given as nel
++       (newline).  It does not matter if the command  clears  the
++       remainder  of  the current line, so if the terminal has no
++       cr and lf it may still be possible to craft a working  nel
+        out of one or both of them.
+ 
+        These  capabilities  suffice  to  describe  hard-copy  and
+-       "glass-tty"  terminals.   Thus  the  model  33 teletype is
++       "glass-tty" terminals.  Thus  the  model  33  teletype  is
+        described as
+ 
+        33|tty33|tty|model 33 teletype,
+@@ -1232,21 +1236,21 @@
+ 
+ 
+    Parameterized Strings
+-       Cursor addressing and other strings  requiring  parameters
+-       in  the  terminal  are described by a parameterized string
+-       capability, with printf(3) like escapes  %x  in  it.   For
+-       example,  to  address  the  cursor,  the cup capability is
++       Cursor  addressing  and other strings requiring parameters
++       in the terminal are described by  a  parameterized  string
++       capability,  with  printf(3)  like  escapes %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 refer to
+        the physical screen visible to the user, not to any unseen
+-       memory.)   If  the  terminal  has  memory  relative cursor
++       memory.)  If  the  terminal  has  memory  relative  cursor
+        addressing, that can be indicated by mrcup.
+ 
+-       The parameter mechanism uses a stack and special  %  codes
+-       to  manipulate  it.  Typically a sequence will push one of
+-       the parameters onto the stack and then print  it  in  some
+-       format.   Print  (e.g.,  "%d")  is  a special case.  Other
+-       operations, including "%t"  pop  their  operand  from  the
++       The  parameter  mechanism uses a stack and special % codes
++       to manipulate it.  Typically a sequence will push  one  of
++       the  parameters  onto  the stack and then print it in some
++       format.  Print (e.g., "%d")  is  a  special  case.   Other
++       operations,  including  "%t"  pop  their  operand from the
+        stack.  It is noted that more complex operations are often
+        necessary, e.g., in the sgr string.
+ 
+@@ -1256,8 +1260,8 @@
+        %%   outputs `%'
+ 
+        %[[:]flags][width[.precision]][doxXs]
+-            as in printf, flags are [-+#] and space.  Use  a  `:'
+-            to  allow the next character to be a `-' flag, avoid-
++            as  in  printf, flags are [-+#] and space.  Use a `:'
++            to allow the next character to be a `-' flag,  avoid-
+             ing interpreting "%-" as an operator.
+ 
+        %c   print pop() like %c in printf
+@@ -1279,11 +1283,11 @@
+        %g[A-Z]
+             get static variable [a-z] and push it
+ 
+-            The terms  "static"  and  "dynamic"  are  misleading.
+-            Historically,  these are simply two different sets of
+-            variables, whose values are not reset  between  calls
+-            to  tparm.   However,  that fact is not documented in
+-            other implementations.  Relying on it will  adversely
++            The  terms  "static"  and  "dynamic"  are misleading.
++            Historically, these are simply two different sets  of
++            variables,  whose  values are not reset between calls
++            to tparm.  However, that fact is  not  documented  in
++            other  implementations.  Relying on it will adversely
+             impact portability to other implementations.
+ 
+        %'c' char constant c
+@@ -1307,16 +1311,16 @@
+             logical AND and OR operations (for conditionals)
+ 
+        %! %~
+-            unary  operations  (logical  and   bit   complement):
++            unary   operations   (logical  and  bit  complement):
+             push(op pop())
+ 
+        %i   add 1 to first two parameters (for ANSI terminals)
+ 
+        %? 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, test-
+-            ing if it is nonzero (true).  If it is zero  (false),
++            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,  test-
++            ing  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:
+@@ -1325,282 +1329,282 @@
+             where ci are conditions, bi are bodies.
+ 
+             Use the -f option of tic or infocmp to see the struc-
+-            ture  of if-then-else's.  Some strings, e.g., sgr can
++            ture 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 with the parts
++            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 variables  are  persistent  across
++       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 row 3 and column 12,
+-       needs to be sent \E&a12c03Y  padded  for  6  milliseconds.
+-       Note  that  the  order of the rows and columns is inverted
+-       here, and that the row and column are printed as two  dig-
++       needs  to  be  sent  \E&a12c03Y padded for 6 milliseconds.
++       Note that the order of the rows and  columns  is  inverted
++       here,  and that the row and column are printed as two dig-
+        its.  Thus its cup capability is "cup=6\E&%p2%2dc%p1%2dY".
+ 
+        The Microterm ACT-IV needs the current row and column sent
+-       preceded  by  a ^T, with the row and column simply encoded
+-       in binary, "cup=^T%p1%c%p2%c".  Terminals which  use  "%c"
+-       need  to  be  able  to backspace the cursor (cub1), and to
++       preceded by a ^T, with the row and column  simply  encoded
++       in  binary,  "cup=^T%p1%c%p2%c".  Terminals which use "%c"
++       need to be able to backspace the  cursor  (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
++       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 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 col-
+        umn  offset  by  a  blank  character,  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  charac-
+-       ter.   Then  the  same  is  done for the second parameter.
++       '%+%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 charac-
++       ter.  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 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
++       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 terminals
++       not of memory.  (Thus, the \EH sequence  on  HP  terminals
+        cannot be used for home.)
+ 
+        If the terminal has row or column absolute cursor address-
+-       ing,  these  can be given as single parameter capabilities
++       ing, these can be given as single  parameter  capabilities
+        hpa (horizontal position absolute) and vpa (vertical posi-
+        tion 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.
++       general  two  parameter  sequence (as with the hp2645) and
++       can be used in preference to cup.  If there are parameter-
++       ized  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 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
++       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 terminal for cursor addressing to work properly.
++       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
++       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.
+ 
+ 
+    Area Clears
+        If the terminal can clear from the current position to the
+-       end  of  the  line,  leaving  the cursor where it is, this
++       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
++       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 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
++       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
++       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  takes two parameters: the top and
++       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
++       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
++       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
+        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
++       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, and is often faster even on  ter-
++       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 ter-
+        minals 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  some-
+-       thing  to  the  bottom line, move the cursor to the top of
++       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 some-
++       thing 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
+-       XSI  Curses  expect that ind, ri, indn, and rin will simu-
+-       late destructive scrolling; their  documentation  cautions
+-       you  not  to  define csr unless this is true.  This curses
++       scrolled off the bottom  of  the  region  by  the  ri  re-
++       appears,  then scrolling is non-destructive.  System V and
++       XSI Curses expect that ind, ri, indn, and rin  will  simu-
++       late  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 scrolling if ndstr is defined.
+ 
+        If the terminal has the ability to define a window as part
+-       of memory, which all commands affect, it should  be  given
++       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
++       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
++       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
+        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 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)
++       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
++       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 ter-
+-       minal  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
++       minal 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  ter-
++       attributes (one line versus multi-line  insert  mode,  and
++       special  treatment of untyped spaces) we have seen no ter-
+        minals whose insert mode cannot be described with the sin-
+        gle attribute.
+ 
+-       Terminfo can describe both terminals which have an  insert
++       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
++       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
++       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  prefer-
+-       able  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
++       If  your terminal has both, insert mode is usually prefer-
++       able 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
++       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
++       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 after  an  insert  of  a  single
++       milliseconds 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
++       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  mode,  give  this  as a number of milliseconds
++       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
++       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 charac-
+-       ter, dch with 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
++       Finally, you can specify dch1 to delete a  single  charac-
++       ter,  dch  with  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
++       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  dif-
++       attributes,  these  can be represented in a number of dif-
+        ferent ways.  You should choose one display form as stand-
+        out 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,
++       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
++       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 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
+-       mode) and  rmacs  (exit  alternate  character  set  mode).
+-       Turning  on  any of these modes singly may or may not turn
++       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), tak-
+-       ing 9 parameters.  Each parameter is either 0 or  nonzero,
++       If  there  is  a sequence to set arbitrary combinations of
++       modes, this should be given as sgr (set attributes),  tak-
++       ing  9 parameters.  Each parameter is either 0 or nonzero,
+        as the corresponding attribute is on or off.  The 9 param-
+-       eters 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
++       eters  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.
+ 
+        For example, the DEC vt220 supports most of the modes:
+@@ -1619,22 +1623,22 @@
+             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
++       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  era-
+-       sures.   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
++       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 era-
++       sures.  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  exam-
+-       ple,  ;7  is output when either p1 or p3 is true, that is,
++       Some  sequences  are common to different modes.  For exam-
++       ple, ;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  depen-
++       Writing  out  the above sequences, along with their depen-
+        dencies yields
+ 
+ 
+@@ -1644,9 +1648,9 @@
+           ;1         if p1 or p6         %?%p1%p6%|%t;1%;
+           ;4         if p2               %?%p2%|%t;4%;
+           ;5         if p4               %?%p4%|%t;5%;
+-
+           ;7         if p1 or p3         %?%p1%p3%|%t;7%;
+           ;8         if p7               %?%p7%|%t;8%;
++
+           m          always              m
+           ^N or ^O   if p9 ^N, else ^O   %?%p9%t^N%e^O%;
+ 
+@@ -1655,76 +1659,75 @@
+            sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;
+                %?%p4%t;5%;%?%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 terminfo entries necessarily have an
+-       sgr string, however.  Many 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
++       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 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  safe  to  move  in
++       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 indi-
+-       cate an error quietly (a bell replacement) then  this  can
++       If the terminal has a way of flashing the screen to  indi-
++       cate  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
++       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
++       non-blinking underline into 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
++       is a way to make the  cursor  completely  invisible,  give
+        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
++       (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
++       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
++       keys  are  pressed,  this  information can be given.  Note
+        that it is not possible to handle terminals where the key-
+        pad 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
++       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 respectively.  If there are  func-
+-       tion  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  given  as  lf0,  lf1,  ...,  lf10.    The   codes
+-       transmitted  by  certain  other special keys can be given:
+-       kll (home down), kbs (backspace), ktbc (clear  all  tabs),
+-       kctab  (clear  the  tab  stop in this column), kclr (clear
+-       screen or  erase  key),  kdch1  (delete  character),  kdl1
+-       (delete line), krmir (exit insert mode), kel (clear to end
+-       of line), ked (clear to  end  of  screen),  kich1  (insert
+-       character  or  enter insert mode), kil1 (insert line), knp
+-       (next  page),  kpp  (previous  page),  kind  (scroll  for-
+-       ward/down), kri (scroll backward/up), 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 direc-
+-       tional pad are needed.
++       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 func-
++       tion 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 given as lf0, lf1, ..., lf10.  The codes transmit-
++       ted by certain other special keys can be given: kll  (home
++       down),  kbs  (backspace),  ktbc  (clear  all  tabs), kctab
++       (clear the tab stop in this column), kclr (clear screen or
++       erase  key), kdch1 (delete character), kdl1 (delete line),
++       krmir (exit insert mode), kel (clear to end of line),  ked
++       (clear to end of screen), kich1 (insert character or enter
++       insert mode), kil1 (insert line),  knp  (next  page),  kpp
++       (previous  page),  kind (scroll forward/down), kri (scroll
++       backward/up), khts (set a tab stop in  this  column).   In
++       addition, if the keypad has a 3 by 3 array of keys includ-
++       ing 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
+@@ -1914,7 +1917,6 @@
+        lantern symbol             ACS_LANTERN    #          i
+        large plus or crossover    ACS_PLUS       +          n
+        less-than-or-equal-to      ACS_LEQUAL     <          y
+-
+        lower left corner          ACS_LLCORNER   +          m
+        lower right corner         ACS_LRCORNER   +          j
+        not-equal                  ACS_NEQUAL     !          |
+@@ -1926,6 +1928,7 @@
+        solid square block         ACS_BLOCK      #          0
+        tee pointing down          ACS_TTEE       +          w
+        tee pointing left          ACS_RTEE       +          u
++
+        tee pointing right         ACS_LTEE       +          t
+        tee pointing up            ACS_BTEE       +          v
+        upper left corner          ACS_ULCORNER   +          l
+diff -Naur ncurses-5.9.orig/doc/html/man/tic.1m.html ncurses-5.9/doc/html/man/tic.1m.html
+--- ncurses-5.9.orig/doc/html/man/tic.1m.html	2012-08-25 19:57:59.356567819 +0000
++++ ncurses-5.9/doc/html/man/tic.1m.html	2012-08-25 19:58:00.289896739 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+@@ -52,84 +52,124 @@
+ 
+ 

+ 
SYNOPSIS
+-       tic  [-1CGILNTUVacfgrstx]  [-e names] [-o dir] [-R subset]
+-       [-v[n]] [-w[n]] file
++       tic  [-01CDGIKLNTUVacfgrstx]  [-e names] [-o dir] [-R sub-
++       set] [-v[n]] [-w[n]] file
+ 
+ 
+ 

+ 
DESCRIPTION
+-       The command tic translates a  terminfo  file  from  source
++       The tic command translates a  terminfo  file  from  source
+        format  into compiled format.  The compiled format is nec-
+        essary for use with the library routines in ncurses(3x).
+ 
+-       The results are normally placed  in  the  system  terminfo
+-       directory  /usr/share/terminfo.   There  are  two  ways to
+-       change this behavior.
+-
+-       First, you may override the system default by setting  the
+-       variable  TERMINFO  in  your  shell environment to a valid
+-       (existing) directory name.
+-
+-       Secondly, if tic cannot get access to  /usr/share/terminfo
+-       or  your  TERMINFO  directory,  it looks for the directory
+-       $HOME/.terminfo; if that directory exists,  the  entry  is
+-       placed there.
++       As described in term(5), the  database  may  be  either  a
++       directory  tree  (one file per terminal entry) or a hashed
++       database (one record per entry).  The tic writes only  one
++       type of entry, depending on how it was built:
++
++       o   For  directory  trees,  the top-level directory, e.g.,
++           /usr/share/terminfo, specifies  the  location  of  the
++           database.
++
++       o   For  hashed  databases,  a filename is needed.  If the
++           given file is not found by that name, but can be found
++           by adding the suffix ".db", then that is used.
++
++           The  default  name for the hashed database is the same
++           as the default directory name  (only  adding  a  ".db"
++           suffix).
++
++       The  results  are  normally  placed in the system terminfo
++       database  /usr/share/terminfo.   The   compiled   terminal
++       description   can   be  placed  in  a  different  terminfo
++       database.  There are two ways to achieve this:
++
++       o   First, you may override the system default by  setting
++           the  variable  TERMINFO in your shell environment to a
++           valid database location, e.g., an  existing  directory
++           (for  directory  trees) or valid location for a hashed
++           database.
++
++       o   Secondly, if tic cannot write  in  /usr/share/terminfo
++           or  the  location  specified using your TERMINFO vari-
++           able, it looks for the directory  $HOME/.terminfo  (or
++           hashed  database $HOME/.terminfo.db); if that location
++           exists, the entry is placed there.
+ 
+        Libraries that read terminfo entries are expected to check
+-       for a TERMINFO directory first, look at $HOME/.terminfo if
+-       TERMINFO  is  not set, and finally look in /usr/share/ter-
+-       minfo.
++       for a location specified with the TERMINFO variable first,
++       look at  $HOME/.terminfo  if  TERMINFO  is  not  set,  and
++       finally look in /usr/share/terminfo.
++
++       -0     restricts the output to a single line
+ 
+        -1     restricts the output to a single column
+ 
+        -a     tells  tic  to  retain  commented-out  capabilities
+               rather than discarding them.  Capabilities are com-
+-              mented by prefixing them with a period.  This  sets
+-              the  -x option, because it treats the commented-out
+-              entries as user-defined names.  If  the  source  is
+-              termcap,  accept  the 2-character names required by
++              mented  by prefixing them with a period.  This sets
++              the -x option, because it treats the  commented-out
++              entries  as  user-defined  names.  If the source is
++              termcap, accept the 2-character names  required  by
+               version 6.  Otherwise these are ignored.
+ 
+-       -C     Force source translation to termcap format.   Note:
+-              this  differs  from the -C option of infocmp(1m) in
++       -C     Force  source translation to termcap format.  Note:
++              this differs from the -C option of  infocmp(1m)  in
+               that it does not merely translate capability names,
+-              but  also  translates  terminfo  strings to termcap
++              but also translates  terminfo  strings  to  termcap
+               format.  Capabilities that are not translatable are
+-              left  in  the  entry under their terminfo names but
+-              commented out with two preceding dots.
++              left in the entry under their  terminfo  names  but
++              commented  out with two preceding dots.  The actual
++              format  used  incorporates  some  improvements  for
++              escaped  characters  from  terminfo  format.  For a
++              stricter BSD-compatible  translation,  add  the  -K
++              option.
+ 
+-       -c     tells tic to only check file for errors,  including
+-              syntax  problems and bad use links.  If you specify
++       -c     tells  tic to only check file for errors, including
++              syntax problems and bad use links.  If you  specify
+               -C (-I) with this option, the code will print warn-
+               ings about entries which, after use resolution, are
+-              more than 1023 (4096) bytes long.  Due to  a  fixed
+-              buffer  length  in  older  termcap libraries (and a
+-              documented limit in terminfo),  these  entries  may
+-              cause core dumps.
++              more  than  1023 (4096) bytes long.  Due to a fixed
++              buffer length in older termcap libraries,  as  well
++              as buggy checking for the buffer length (and a doc-
++              umented limit in terminfo), these entries may cause
++              core dumps with other implementations.
++
++       -D     tells  tic  to print the database locations that it
++              knows about, and exit.  The first location shown is
++              the  one  to which it would write compiled terminal
++              descriptions.   If  tic  is  not  able  to  find  a
++              writable  database  location according to the rules
++              summarized above, it will print  a  diagnostic  and
++              exit  with  an error rather than printing a list of
++              database locations.
+ 
+        -e names
+-              Limit  writes  and  translations  to  the following
+-              comma-separated list of terminals.  If any name  or
++              Limit writes  and  translations  to  the  following
++              comma-separated  list of terminals.  If any name or
+               alias of a terminal matches one of the names in the
+-              list, the entry will be written  or  translated  as
+-              normal.   Otherwise no output will be generated for
++              list,  the  entry  will be written or translated as
++              normal.  Otherwise no output will be generated  for
+               it.  The option value is interpreted as a file con-
+-              taining  the  list  if  it  contains a '/'.  (Note:
+-              depending on how tic was compiled, this option  may
++              taining the list if  it  contains  a  '/'.   (Note:
++              depending  on how tic was compiled, this option may
+               require -I or -C.)
+ 
+        -f     Display  complex  terminfo  strings  which  contain
+-              if/then/else/endif expressions indented  for  read-
++              if/then/else/endif  expressions  indented for read-
+               ability.
+ 
+-       -G     Display  constant  literals  in decimal form rather
++       -G     Display constant literals in  decimal  form  rather
+               than their character equivalents.
+ 
+-       -g     Display constant character literals in quoted  form
++       -g     Display  constant character literals in quoted form
+               rather than their decimal equivalents.
+ 
+        -I     Force source translation to terminfo format.
+ 
++       -K     Suppress some longstanding  ncurses  extensions  to
++              termcap format, e.g., "\s" for space.
++
+        -L     Force  source  translation to terminfo format using
+               the long C variable names listed in <term.h>
+ 
+@@ -137,78 +177,79 @@
+               from termcap to terminfo, the compiler makes a num-
+               ber of assumptions about  the  defaults  of  string
+               capabilities  reset1_string,  carriage_return, cur-
+-              sor_left, cursor_down,  scroll_forward,  tab,  new-
+-              line,  key_backspace,  key_left, and key_down, then
+-              attempts to use obsolete  termcap  capabilities  to
+-              deduce correct values.  It also normally suppresses
+-              output of obsolete termcap capabilities such as bs.
+-              This  option forces a more literal translation that
+-              also preserves the obsolete capabilities.
++              sor_left,   cursor_down,    scroll_forward,    tab,
++              newline,  key_backspace,  key_left,  and  key_down,
++              then attempts to use obsolete termcap  capabilities
++              to  deduce  correct  values.  It also normally sup-
++              presses output  of  obsolete  termcap  capabilities
++              such  as  bs.   This  option  forces a more literal
++              translation that also preserves the obsolete  capa-
++              bilities.
+ 
+-       -odir  Write compiled entries to given  directory.   Over-
+-              rides the TERMINFO environment variable.
++       -odir  Write  compiled entries to given database location.
++              Overrides the TERMINFO environment variable.
+ 
+        -Rsubset
+-              Restrict  output to a given subset.  This option is
+-              for use with  archaic  versions  of  terminfo  like
++              Restrict output to a given subset.  This option  is
++              for  use  with  archaic  versions  of terminfo like
+               those on SVr1, Ultrix, or HP/UX that do not support
+-              the full set of SVR4/XSI Curses terminfo; and  out-
++              the  full set of SVR4/XSI Curses terminfo; and out-
+               right broken ports like AIX 3.x that have their own
+-              extensions incompatible with  SVr4/XSI.   Available
++              extensions  incompatible  with SVr4/XSI.  Available
+               subsets  are  "SVr1",  "Ultrix",  "HP",  "BSD"  and
+               "AIX"; see terminfo(5) for details.
+ 
+-       -r     Force entry resolution (so there are  no  remaining
+-              tc  capabilities)  even  when  doing translation to
+-              termcap format.  This may  be  needed  if  you  are
+-              preparing  a  termcap  file  for  a termcap library
+-              (such as GNU termcap through  version  1.3  or  BSD
++       -r     Force  entry  resolution (so there are no remaining
++              tc capabilities) even  when  doing  translation  to
++              termcap  format.   This  may  be  needed if you are
++              preparing a termcap  file  for  a  termcap  library
++              (such  as  GNU  termcap  through version 1.3 or BSD
+               termcap through 4.3BSD) that does not handle multi-
+               ple tc capabilities per entry.
+ 
+-       -s     Summarize the compile by showing the directory into
+-              which  entries  are  written,  and  the  number  of
+-              entries which are compiled.
++       -s     Summarize the compile by showing the database loca-
++              tion into which entries are written, and the number
++              of entries which are compiled.
+ 
+        -T     eliminates size-restrictions on the generated text.
+-              This  is  mainly  useful  for testing and analysis,
+-              since the compiled descriptions are limited  (e.g.,
++              This is mainly useful  for  testing  and  analysis,
++              since  the compiled descriptions are limited (e.g.,
+               1023 for termcap, 4096 for terminfo).
+ 
+-       -t     tells  tic  to  discard commented-out capabilities.
++       -t     tells tic to  discard  commented-out  capabilities.
+               Normally when translating from terminfo to termcap,
+               untranslatable capabilities are commented-out.
+ 
+-       -U   tells  tic to not post-process the data after parsing
+-            the source file.  Normally, it infers data  which  is
+-            commonly  missing in older terminfo data, or in term-
++       -U   tells tic to not post-process the data after  parsing
++            the  source  file.  Normally, it infers data which is
++            commonly missing in older terminfo data, or in  term-
+             caps.
+ 
+        -V   reports the version of ncurses which was used in this
+             program, and exits.
+ 
+-       -vn  specifies  that  (verbose) output be written to stan-
+-            dard error trace information showing tic's  progress.
+-            The  optional  parameter  n is a number from 1 to 10,
+-            inclusive, indicating the desired level of detail  of
+-            information.   If  n is omitted, the default level is
+-            1.  If n is specified and greater than 1,  the  level
++       -vn  specifies that (verbose) output be written  to  stan-
++            dard  error trace information showing tic's progress.
++            The optional parameter n is a number from  1  to  10,
++            inclusive,  indicating the desired level of detail of
++            information.  If n is omitted, the default  level  is
++            1.   If  n is specified and greater than 1, the level
+             of detail is increased.
+ 
+-       -wn  specifies  the width of the output.  The parameter is
++       -wn  specifies the width of the output.  The parameter  is
+             optional.  If it is omitted, it defaults to 60.
+ 
+        -x   Treat unknown capabilities as user-defined.  That is,
+-            if  you  supply  a capability name which tic does not
++            if you supply a capability name which  tic  does  not
+             recognize, it will infer its type (boolean, number or
+-            string)  from  the  syntax and make an extended table
++            string) from the syntax and make  an  extended  table
+             entry  for  that.   User-defined  capability  strings
+-            whose  name begins with ``k'' are treated as function
++            whose name begins with ``k'' are treated as  function
+             keys.
+ 
+-       file contains one or more terminfo  terminal  descriptions
++       file contains  one  or more terminfo terminal descriptions
+             in source format [see terminfo(5)].  Each description
+-            in the file describes the capabilities of a  particu-
++            in  the file describes the capabilities of a particu-
+             lar terminal.
+ 
+        The debug flag levels are as follows:
+@@ -228,73 +269,73 @@
+        9      All values computed in construction of the hash ta-
+               ble
+ 
+-       If the debug level n is not given, it is taken to be  one.
++       If  the debug level n is not given, it is taken to be one.
+ 
+        All but one of the capabilities recognized by tic are doc-
+        umented in terminfo(5).  The exception is the use capabil-
+        ity.
+ 
+-       When  a  use=entry-name  field is discovered in a terminal
+-       entry currently being compiled, tic reads  in  the  binary
+-       from  /usr/share/terminfo to complete the entry.  (Entries
+-       created from file will be used first.  If the  environment
+-       variable  TERMINFO  is  set,  that  directory  is searched
+-       instead of /usr/share/terminfo.)  tic duplicates the capa-
+-       bilities  in  entry-name  for  the current entry, with the
+-       exception  of  those  capabilities  that  explicitly   are
++       When a use=entry-name field is discovered  in  a  terminal
++       entry  currently  being  compiled, tic reads in the binary
++       from /usr/share/terminfo to complete the entry.   (Entries
++       created  from file will be used first.  If the environment
++       variable  TERMINFO  is  set,  that  database  location  is
++       searched  instead of /usr/share/terminfo.)  tic duplicates
++       the capabilities in entry-name for the current entry, with
++       the  exception  of  those capabilities that explicitly are
+        defined in the current entry.
+ 
+-       When    an   entry,   e.g.,   entry_name_1,   contains   a
+-       use=entry_name_2  field,  any  canceled  capabilities   in
+-       entry_name_2  must also appear in entry_name_1 before use=
++       When   an   entry,   e.g.,   entry_name_1,   contains    a
++       use=entry_name_2   field,  any  canceled  capabilities  in
++       entry_name_2 must also appear in entry_name_1 before  use=
+        for these capabilities to be canceled in entry_name_1.
+ 
+-       If the environment variable TERMINFO is set, the  compiled
++       If  the environment variable TERMINFO is set, the compiled
+        results are placed there instead of /usr/share/terminfo.
+ 
+        Total compiled entries cannot exceed 4096 bytes.  The name
+-       field cannot exceed 512 bytes.  Terminal  names  exceeding
+-       the  maximum  alias  length (32 characters on systems with
++       field  cannot  exceed 512 bytes.  Terminal names exceeding
++       the maximum alias length (32 characters  on  systems  with
+        long filenames, 14 characters otherwise) will be truncated
+-       to  the maximum alias length and a warning message will be
++       to the maximum alias length and a warning message will  be
+        printed.
+ 
+ 
+ 

+ 
COMPATIBILITY
+-       There is some evidence that historic  tic  implementations
+-       treated  description  fields with no whitespace in them as
+-       additional aliases or short names.  This tic does  not  do
+-       that,  but  it  does  warn  when description fields may be
+-       treated that way and check them for dangerous  characters.
++       There  is  some evidence that historic tic implementations
++       treated description fields with no whitespace in  them  as
++       additional  aliases  or short names.  This tic does not do
++       that, but it does warn  when  description  fields  may  be
++       treated  that way and check them for dangerous characters.
+ 
+ 
+ 

+ 
EXTENSIONS
+        Unlike the stock SVr4 tic command, this implementation can
+-       actually compile termcap sources.   In  fact,  entries  in
+-       terminfo  and  termcap  syntax  can  be  mixed in a single
+-       source file.  See terminfo(5)  for  the  list  of  termcap
++       actually  compile  termcap  sources.   In fact, entries in
++       terminfo and termcap syntax  can  be  mixed  in  a  single
++       source  file.   See  terminfo(5)  for  the list of termcap
+        names taken to be equivalent to terminfo names.
+ 
+-       The  SVr4  manual  pages  are  not clear on the resolution
+-       rules for use capabilities.  This  implementation  of  tic
++       The SVr4 manual pages are  not  clear  on  the  resolution
++       rules  for  use  capabilities.  This implementation of tic
+        will find use targets anywhere in the source file, or any-
+-       where in the file tree rooted at TERMINFO (if TERMINFO  is
+-       defined),  or  in the user's $HOME/.terminfo directory (if
+-       it exists), or (finally) anywhere  in  the  system's  file
+-       tree of compiled entries.
++       where  in the file tree rooted at TERMINFO (if TERMINFO is
++       defined), or in the user's $HOME/.terminfo database (if it
++       exists),  or  (finally) anywhere in the system's file tree
++       of compiled entries.
+ 
+-       The  error  messages from this tic have the same format as
+-       GNU C error messages, and can be  parsed  by  GNU  Emacs's
++       The error messages from this tic have the same  format  as
++       GNU  C  error  messages,  and can be parsed by GNU Emacs's
+        compile facility.
+ 
+-       The  -C,  -G,  -I, -N, -R, -T, -V, -a, -e, -f, -g, -o, -r,
+-       -s, -t and -x options are not supported under  SVr4.   The
+-       SVr4 -c mode does not report bad use links.
++       The -0, -1, -C, -G, -I, -N, -R, -T, -V, -a,  -e,  -f,  -g,
++       -o,  -r,  -s,  -t  and  -x options are not supported under
++       SVr4.  The SVr4 -c mode does not report bad use links.
+ 
+-       System  V does not compile entries to or read entries from
+-       your $HOME/.terminfo directory unless TERMINFO is  explic-
++       System V does not compile entries to or read entries  from
++       your  $HOME/.terminfo  database unless TERMINFO is explic-
+        itly set to it.
+ 
+ 
+@@ -306,10 +347,10 @@
+ 
+ 

+ 
SEE ALSO
+-       infocmp(1m),    captoinfo(1m),   infotocap(1m),   toe(1m),
+-       curses(3x), terminfo(5).
++       infocmp(1m),   captoinfo(1m),   infotocap(1m),    toe(1m),
++       curses(3x), term(5).  terminfo(5).
+ 
+-       This describes ncurses version 5.9 (patch 20110404).
++       This describes ncurses version 5.9 (patch 20120107).
+ 
+ 
+ 

+diff -Naur ncurses-5.9.orig/doc/html/man/toe.1m.html ncurses-5.9/doc/html/man/toe.1m.html
+--- ncurses-5.9.orig/doc/html/man/toe.1m.html	2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/toe.1m.html	2012-08-25 19:58:00.289896739 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+@@ -52,7 +52,7 @@
+ 
+ 

+ 
SYNOPSIS
+-       toe [-v[n]] [-ahuUV] file...
++       toe [-v[n]] [-ahsuUV] file...
+ 
+ 
+ 

+@@ -71,6 +71,14 @@
+               ncurses would search, rather than  only  the  first
+               one that it finds.
+ 
++              If  the  -s is also given, toe adds a column to the
++              report, showing (like  conflict(1))  which  entries
++              which  belong to a given terminal database.  An "*"
++              marks entries which differ, and "+"  marks  equiva-
++              lent entries.
++
++       -s     sort the output by the entry names.
++
+        -u file
+               says  to  write  a  report  to the standard output,
+               listing dependencies in the given  terminfo/termcap
+@@ -111,7 +119,7 @@
+        tic(1m),    infocmp(1m),   captoinfo(1m),   infotocap(1m),
+        curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 5.9 (patch 20110404).
++       This describes ncurses version 5.9 (patch 20120107).
+ 
+ 
+ 
+diff -Naur ncurses-5.9.orig/doc/html/man/tput.1.html ncurses-5.9/doc/html/man/tput.1.html
+--- ncurses-5.9.orig/doc/html/man/tput.1.html	2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/tput.1.html	2012-08-25 19:58:00.289896739 +0000
+@@ -2,7 +2,7 @@
+ 
+ 
+ 
+@@ -319,16 +319,28 @@
+        name support.  Other implementations of tput on SVr4-based
+        systems such as Solaris, IRIX64 and HPUX as well as others
+        such  as  AIX  and  Tru64  provide  support  for   capname
+-       operands.  A few platforms such as FreeBSD and NetBSD rec-
+-       ognize termcap names rather than terminfo capability names
+-       in their respective tput commands.
++       operands.
++
++       A few platforms such as FreeBSD and NetBSD recognize term-
++       cap names rather than terminfo capability names  in  their
++       respective tput commands.
++
++       Most  implementations  which  provide  support for capname
++       operands use the tparm function to  expand  parameters  in
++       it.  That function expects a mixture of numeric and string
++       parameters, requiring tput to  know  which  type  to  use.
++       This implementation uses a table to determine that for the
++       standard capname operands, and an internal  library  func-
++       tion  to  analyze  nonstandard  capname  operands.   Other
++       implementations may simply guess that an operand  contain-
++       ing only digits is intended to be a number.
+ 
+ 
+
+

SEE ALSO

+-       clear(1), stty(1), tabs(1), terminfo(5).
++       clear(1), stty(1), tabs(1), terminfo(5), curs_termcap(3x).
+ 
+-       This describes ncurses version 5.9 (patch 20110404).
++       This describes ncurses version 5.9 (patch 20120107).
+ 
+ 
+ 
+diff -Naur ncurses-5.9.orig/doc/html/man/tset.1.html ncurses-5.9/doc/html/man/tset.1.html
+--- ncurses-5.9.orig/doc/html/man/tset.1.html	2012-08-25 19:57:59.363234455 +0000
++++ ncurses-5.9/doc/html/man/tset.1.html	2012-08-25 19:58:00.289896739 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+ 
+@@ -116,8 +116,9 @@
+ 
+        The options are as follows:
+ 
+-       -c   Set  control  characters and modes.  -e Set the erase
+-            character to ch.
++       -c   Set control characters and modes.
++
++       -e   Set the erase character to ch.
+ 
+        -I   Do  not  send  the  terminal  or  tab  initialization
+             strings to the terminal.
+@@ -126,51 +127,51 @@
+ 
+        -k   Set the line kill character to ch.
+ 
+-       -m   Specify  a  mapping  from  a port type to a terminal.
++       -m   Specify a mapping from a port  type  to  a  terminal.
+             See the section TERMINAL TYPE MAPPING for more infor-
+             mation.
+ 
+-       -Q   Do  not  display  any values for the erase, interrupt
++       -Q   Do not display any values for  the  erase,  interrupt
+             and line kill characters.  Normally tset displays the
+-            values  for  control characters which differ from the
++            values for control characters which differ  from  the
+             system's default values.
+ 
+-       -q   The terminal type is displayed to the  standard  out-
+-            put,  and the terminal is not initialized in any way.
++       -q   The  terminal  type is displayed to the standard out-
++            put, and the terminal is not initialized in any  way.
+             The option `-' by itself is equivalent but archaic.
+ 
+        -r   Print the terminal type to the standard error output.
+ 
+-       -s   Print  the  sequence  of shell commands to initialize
++       -s   Print the sequence of shell  commands  to  initialize
+             the environment variable TERM to the standard output.
+-            See  the section SETTING THE ENVIRONMENT for details.
++            See the section SETTING THE ENVIRONMENT for  details.
+ 
+        -V   reports the version of ncurses which was used in this
+             program, and exits.
+ 
+-       -w   Resize  the  window  to  match  the  size deduced via
++       -w   Resize the window  to  match  the  size  deduced  via
+             setupterm.   Normally  this  has  no  effect,  unless
+             setupterm is not able to detect the window size.
+ 
+        The arguments for the -e, -i, and -k options may either be
+-       entered as actual characters or by using the  `hat'  nota-
+-       tion,  i.e.,  control-h  may  be  specified  as  ``^H'' or
++       entered  as  actual characters or by using the `hat' nota-
++       tion, i.e.,  control-h  may  be  specified  as  ``^H''  or
+        ``^h''.
+ 
+ 
+
+

SETTING THE ENVIRONMENT

+-       It is often desirable  to  enter  the  terminal  type  and
+-       information  about  the  terminal's  capabilities into the
++       It  is  often  desirable  to  enter  the terminal type and
++       information about the  terminal's  capabilities  into  the
+        shell's environment.  This is done using the -s option.
+ 
+        When the -s option is specified, the commands to enter the
+-       information  into  the  shell's environment are written to
+-       the standard output.  If the SHELL environmental  variable
++       information into the shell's environment  are  written  to
++       the  standard output.  If the SHELL environmental variable
+        ends in ``csh'', the commands are for csh, otherwise, they
+-       are for sh.  Note, the csh  commands  set  and  unset  the
+-       shell  variable  noglob,  leaving it unset.  The following
+-       line in the .login or .profile files will  initialize  the
++       are  for  sh.   Note,  the  csh commands set and unset the
++       shell variable noglob, leaving it  unset.   The  following
++       line  in  the .login or .profile files will initialize the
+        environment correctly:
+ 
+            eval `tset -s options ... `
+@@ -180,107 +181,107 @@
+ 
TERMINAL TYPE MAPPING
+        When the terminal is not hardwired into the system (or the
+        current system information is incorrect) the terminal type
+-       derived  from the /etc/ttys file or the TERM environmental
+-       variable is often something generic like network,  dialup,
+-       or  unknown.   When tset is used in a startup script it is
+-       often desirable to provide information about the  type  of
++       derived from the /etc/ttys file or the TERM  environmental
++       variable  is often something generic like network, dialup,
++       or unknown.  When tset is used in a startup script  it  is
++       often  desirable  to provide information about the type of
+        terminal used on such ports.
+ 
+-       The  purpose  of  the -m option is to map from some set of
+-       conditions to a terminal type, that is, to tell tset  ``If
+-       I'm  on this port at a particular speed, guess that I'm on
++       The purpose of the -m option is to map from  some  set  of
++       conditions  to a terminal type, that is, to tell tset ``If
++       I'm on this port at a particular speed, guess that I'm  on
+        that kind of terminal''.
+ 
+        The argument to the -m option consists of an optional port
+        type, an optional operator, an optional baud rate specifi-
+        cation, an optional colon (``:'') character and a terminal
+-       type.   The port type is a string (delimited by either the
++       type.  The port type is a string (delimited by either  the
+        operator or the colon character).  The operator may be any
+        combination of ``>'', ``<'', ``@'', and ``!''; ``>'' means
+-       greater than, ``<'' means less than, ``@'' means equal  to
++       greater  than, ``<'' means less than, ``@'' means equal to
+        and ``!'' inverts the sense of the test.  The baud rate is
+-       specified as a number and is compared with  the  speed  of
+-       the  standard  error  output  (which should be the control
++       specified  as  a  number and is compared with the speed of
++       the standard error output (which  should  be  the  control
+        terminal).  The terminal type is a string.
+ 
+        If the terminal type is not specified on the command line,
+-       the  -m mappings are applied to the terminal type.  If the
+-       port type and baud rate match the  mapping,  the  terminal
+-       type  specified  in the mapping replaces the current type.
+-       If more than one mapping is specified, the first  applica-
++       the -m mappings are applied to the terminal type.  If  the
++       port  type  and  baud rate match the mapping, the terminal
++       type specified in the mapping replaces the  current  type.
++       If  more than one mapping is specified, the first applica-
+        ble mapping is used.
+ 
+-       For    example,    consider    the    following   mapping:
++       For   example,    consider    the    following    mapping:
+        dialup>9600:vt100.  The port type is dialup , the operator
+-       is  >, the baud rate specification is 9600, and the termi-
++       is >, the baud rate specification is 9600, and the  termi-
+        nal type is vt100.  The result of this mapping is to spec-
+        ify that if the terminal type is dialup, and the baud rate
+-       is greater than 9600 baud, a terminal type of  vt100  will
++       is  greater  than 9600 baud, a terminal type of vt100 will
+        be used.
+ 
+        If no baud rate is specified, the terminal type will match
+        any baud rate.  If no port type is specified, the terminal
+-       type   will   match   any  port  type.   For  example,  -m
++       type  will  match  any  port  type.    For   example,   -m
+        dialup:vt100  -m  :?xterm  will  cause  any  dialup  port,
+        regardless of baud rate, to match the terminal type vt100,
+-       and any non-dialup port type to match  the  terminal  type
+-       ?xterm.   Note,  because of the leading question mark, the
+-       user will be queried on a default port as to whether  they
++       and  any  non-dialup  port type to match the terminal type
++       ?xterm.  Note, because of the leading question  mark,  the
++       user  will be queried on a default port as to whether they
+        are actually using an xterm terminal.
+ 
+-       No  whitespace  characters  are permitted in the -m option
+-       argument.  Also, to avoid problems  with  meta-characters,
+-       it  is  suggested  that  the  entire -m option argument be
+-       placed within single quote characters, and that csh  users
+-       insert  a  backslash character (``\'') before any exclama-
++       No whitespace characters are permitted in  the  -m  option
++       argument.   Also,  to avoid problems with meta-characters,
++       it is suggested that the  entire  -m  option  argument  be
++       placed  within single quote characters, and that csh users
++       insert a backslash character (``\'') before  any  exclama-
+        tion marks (``!'').
+ 
+ 
+ 

+ 
HISTORY
+-       The tset command appeared in BSD 3.0.  The ncurses  imple-
+-       mentation  was lightly adapted from the 4.4BSD sources for
++       The  tset command appeared in BSD 3.0.  The ncurses imple-
++       mentation was lightly adapted from the 4.4BSD sources  for
+        a terminfo environment by Eric S. Raymond <esr@snark.thyr-
+        sus.com>.
+ 
+ 
+ 

+ 
COMPATIBILITY
+-       The  tset  utility has been provided for backward-compati-
+-       bility with BSD environments (under  most  modern  UNIXes,
+-       /etc/inittab  and  getty(1) can set TERM appropriately for
+-       each dial-up line; this  obviates  what  was  tset's  most
+-       important  use).   This implementation behaves like 4.4BSD
++       The tset utility has been provided  for  backward-compati-
++       bility  with  BSD  environments (under most modern UNIXes,
++       /etc/inittab and getty(1) can set TERM  appropriately  for
++       each  dial-up  line;  this  obviates  what was tset's most
++       important use).  This implementation behaves  like  4.4BSD
+        tset, with a few exceptions specified here.
+ 
+-       The -S option of BSD tset no longer works;  it  prints  an
++       The  -S  option  of BSD tset no longer works; it prints an
+        error message to stderr and dies.  The -s option only sets
+-       TERM, not TERMCAP.  Both these  changes  are  because  the
+-       TERMCAP  variable  is  no longer supported under terminfo-
++       TERM,  not  TERMCAP.   Both  these changes are because the
++       TERMCAP variable is no longer  supported  under  terminfo-
+        based ncurses, which makes tset -S useless (we made it die
+        noisily rather than silently induce lossage).
+ 
+-       There  was  an  undocumented  4.4BSD feature that invoking
++       There was an undocumented  4.4BSD  feature  that  invoking
+        tset via a link named `TSET` (or via any other name begin-
+-       ning  with  an  upper-case letter) set the terminal to use
++       ning with an upper-case letter) set the  terminal  to  use
+        upper-case only.  This feature has been omitted.
+ 
+-       The -A, -E, -h, -u and -v options were  deleted  from  the
+-       tset  utility  in 4.4BSD.  None of them were documented in
+-       4.3BSD and all are of limited utility at  best.   The  -a,
++       The  -A,  -E,  -h, -u and -v options were deleted from the
++       tset utility in 4.4BSD.  None of them were  documented  in
++       4.3BSD  and  all  are of limited utility at best.  The -a,
+        -d, and -p options are similarly not documented or useful,
+-       but were retained as they appear to be in widespread  use.
+-       It  is  strongly recommended that any usage of these three
+-       options be changed to use the -m option instead.   The  -n
+-       option  remains, but has no effect.  The -adnp options are
++       but  were retained as they appear to be in widespread use.
++       It is strongly recommended that any usage of  these  three
++       options  be  changed to use the -m option instead.  The -n
++       option remains, but has no effect.  The -adnp options  are
+        therefore omitted from the usage summary above.
+ 
+-       It is still permissible to specify  the  -e,  -i,  and  -k
+-       options  without arguments, although it is strongly recom-
+-       mended that such usage be fixed to explicitly specify  the
++       It  is  still  permissible  to  specify the -e, -i, and -k
++       options without arguments, although it is strongly  recom-
++       mended  that such usage be fixed to explicitly specify the
+        character.
+ 
+-       As  of  4.4BSD,  executing tset as reset no longer implies
++       As of 4.4BSD, executing tset as reset  no  longer  implies
+        the -Q option.  Also, the interaction between the - option
+        and the terminal argument in some historic implementations
+        of tset has been removed.
+@@ -294,7 +295,7 @@
+             tells tset whether to initialize TERM using sh or csh
+             syntax.
+ 
+-       TERM Denotes  your  terminal  type.  Each terminal type is
++       TERM Denotes your terminal type.  Each  terminal  type  is
+             distinct, though many are similar.
+ 
+        TERMCAP
+@@ -307,7 +308,7 @@
+ 

+ 
FILES
+        /etc/ttys
+-            system  port  name  to terminal type mapping database
++            system port name to terminal  type  mapping  database
+             (BSD versions only).
+ 
+        /usr/share/terminfo
+@@ -316,10 +317,10 @@
+ 
+ 

+ 
SEE ALSO
+-       csh(1), sh(1), stty(1),  curs_terminfo(3x),  tty(4),  ter-
++       csh(1),  sh(1),  stty(1),  curs_terminfo(3x), tty(4), ter-
+        minfo(5), ttys(5), environ(7)
+ 
+-       This describes ncurses version 5.9 (patch 20110404).
++       This describes ncurses version 5.9 (patch 20120107).
+ 
+ 
+ 
+diff -Naur ncurses-5.9.orig/doc/html/ncurses-intro.html ncurses-5.9/doc/html/ncurses-intro.html
+--- ncurses-5.9.orig/doc/html/ncurses-intro.html	2012-08-25 19:57:59.366567772 +0000
++++ ncurses-5.9/doc/html/ncurses-intro.html	2012-08-25 19:58:01.293225327 +0000
+@@ -1,8 +1,8 @@
+ 
+