From 646a5c1cbfd95873950a87b5f75d52073a967023 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding
Date: Mon, 28 May 2018 19:12:29 +0000
Subject: Mon May 28 19:12:29 UTC 2018
a/pkgtools-15.0-noarch-13.txz: Rebuilt.
installpkg: default line length for --terselength is the number of columns.
removepkg: added --terse mode.
upgradepkg: default line length for --terselength is the number of columns.
upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz: Upgraded.
d/bison-3.0.5-x86_64-1.txz: Upgraded.
e/emacs-26.1-x86_64-1.txz: Upgraded.
kde/kopete-4.14.3-x86_64-8.txz: Rebuilt.
Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz: Upgraded.
n/links-2.16-x86_64-2.txz: Rebuilt.
Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded.
n/nftables-0.8.5-x86_64-1.txz: Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz: Upgraded.
n/ulogd-2.0.7-x86_64-1.txz: Upgraded.
n/whois-5.3.1-x86_64-1.txz: Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
---
source/l/ncurses/Eterm.ti | 150 -
source/l/ncurses/aaa_terminfo.SlackBuild | 105 +
source/l/ncurses/doinst.sh | 3 +
source/l/ncurses/ncurses-5.9-20141206-patch.sh | 235455 ---------------------
source/l/ncurses/ncurses.SlackBuild | 175 +-
source/l/ncurses/rxvt.terminfo | 55 -
source/l/ncurses/screeninfo.src | 73 -
source/l/ncurses/slack-desc | 10 +-
source/l/ncurses/slack-desc.aaa_terminfo | 19 +
source/l/ncurses/terminfo/tmux.terminfo | 7 +
source/l/ncurses/terminfo/tmux.terminfo.README | 2 +
source/l/ncurses/terminfo/xterm.terminfo | 2460 +
source/l/ncurses/terminfo/xterm.terminfo.README | 6 +
source/l/ncurses/terminfo/xterm.terminfo.diff | 25 +
source/l/ncurses/terminfo/xterm.terminfo.orig | 2447 +
source/l/ncurses/xterm.terminfo | 1939 -
16 files changed, 5187 insertions(+), 237744 deletions(-)
delete mode 100644 source/l/ncurses/Eterm.ti
create mode 100755 source/l/ncurses/aaa_terminfo.SlackBuild
create mode 100644 source/l/ncurses/doinst.sh
delete mode 100644 source/l/ncurses/ncurses-5.9-20141206-patch.sh
delete mode 100644 source/l/ncurses/rxvt.terminfo
delete mode 100644 source/l/ncurses/screeninfo.src
create mode 100644 source/l/ncurses/slack-desc.aaa_terminfo
create mode 100644 source/l/ncurses/terminfo/tmux.terminfo
create mode 100644 source/l/ncurses/terminfo/tmux.terminfo.README
create mode 100644 source/l/ncurses/terminfo/xterm.terminfo
create mode 100644 source/l/ncurses/terminfo/xterm.terminfo.README
create mode 100644 source/l/ncurses/terminfo/xterm.terminfo.diff
create mode 100644 source/l/ncurses/terminfo/xterm.terminfo.orig
delete mode 100644 source/l/ncurses/xterm.terminfo
(limited to 'source/l/ncurses')
diff --git a/source/l/ncurses/Eterm.ti b/source/l/ncurses/Eterm.ti
deleted file mode 100644
index b711cb923..000000000
--- a/source/l/ncurses/Eterm.ti
+++ /dev/null
@@ -1,150 +0,0 @@
-# Eterm terminfo file
-
-Eterm|Eterm Terminal Emulator (X11 Window System),
-# FIXME: xterm does not specify bce, bw, eo, or xon. Should we?
- am, bw, bce, km, mir, msgr, xenl, xon, eo, mc5i,
- cols#80, lines#24, it#8, lm#0, btns#5,
- cr=\r, bel=^G,
- colors#8, pairs#64,
-
-# Scroll text down/up one line
- ind=\n, ri=\eM,
-
-# Clear entire screen (home, then clear to EOS), EOS, EOL, BOL
- clear=\e[H\e[2J, ed=\e[J, el=\e[K, el1=\e[1K,
-
-# Change scrolling region to lines $1+1 to $2+1
-# %i means add one to params 1 and 2; convert from 0-based to
-# 1-based counting.
- csr=\e[%i%p1%d;%p2%dr,
-
-# Move cursor to row $1+1, column $2+1. Can end with H or f
- cup=\e[%i%p1%d;%p2%dH,
-# Move cursor to column n, same row; or row n, same column
- hpa=\e[%i%p1%dG, vpa=\e[%i%p1%dd,
-# Move cursor up/down/forward/back by n chars
- cuu=\e[%p1%dA, cud=\e[%p1%dB, cuf=\e[%p1%dC, cub=\e[%p1%dD,
-# Move cursor up/down/forward/back by 1 char
- cuu1=\e[A, cud1=\e[B, cuf1=\e[C, cub1=\b,
-# Home cursor (row 1, col 1). Was \e[1;1H but 1's are redundant
- home=\e[H,
-
-# Enter/leave insert mode
- smir=\e[4h, rmir=\e[4l,
-
-# Set tab stops, clear tab stops, tab character
- hts=\eH, tbc=\e[3g, ht=\t,
-
-# Turn on/off auto margins
- smam=\e[?7h, rmam=\e[?7l,
-# Make cursor invisible, normal (bold cursor cvvis not supported)
- civis=\e[?25l, cnorm=\e[?25h,
-# Save/restore cursor position
- sc=\e7, rc=\e8,
-
-# Alternate character set (line drawing), enable/enter/exit ACS
- acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-# The line below is used by some vtXXX emulators, but I don't think it's right for us.
-# acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
- enacs=\e)0, smacs=^N, rmacs=^O,
-
-# Delete/insert n chars, 1 char
- dch=\e[%p1%dP, ich=\e[%p1%d@, dch1=\e[P, ich1=\e[@,
-# Delete/insert n lines, 1 line
- dl=\e[%p1%dM, il=\e[%p1%dL, dl1=\e[M, il1=\e[L,
-# Erase next n chars
- ech=\e[%p1%dX,
-
-# Activate SGR mode: bold, reverse video, blink (bright bg color)
- bold=\e[1m, rev=\e[7m, blink=\e[5m,
-# Start/stop underline, standout (reverse video)
- smul=\e[4m, rmul=\e[24m, smso=\e[7m, rmso=\e[27m,
-# Turn off all attributes (exit_attribute_mode)
- sgr0=\e[m^O,
-# Flash the screen (sets and resets reverse video for the whole screen)
- flash=\e[?5h\e[?5l,
-
-# Enter/leave application keypad mode. We always send the ANSI values
-# because that seems to be the most portable solution. The valid escape
-# sequences are here but are commented out for this reason. The 1st set
-# is for keypad cursor keys, the second is for application cursor key
-# mode. The third is what gets sent by default.
-## smkx=\e=, rmkx=\e>,
- smkx=, rmkx=,
-## kcuu1=\e[Ox, kcud1=\e[Or, kcuf1=\e[Ov, kcub1=\e[Ot,
-## kcuu1=\eOA, kcud1=\eOB, kcuf1=\eOC, kcub1=\eOD,
- kcuu1=\e[A, kcud1=\e[B, kcuf1=\e[C, kcub1=\e[D,
-
-# Keypad 7, 9, 5, 1, and 3. The 1st set are the appl. keypad mode
-# sequences. The 2nd set are the values for Home/End/PgUp/PgDn.
-# The 5 key is the same either way.
-## ka1=\eOw, ka3=\eOy, kb2=\eOu, kc1=\eOq, kc3=\eOs,
- ka1=\e[7~, ka3=\e[5~, kb2=\eOu, kc1=\e[8~, kc3=\e[6~,
-
-# Function keys
- kf1=\e[11~, kf2=\e[12~, kf3=\e[13~, kf4=\e[14~, kf5=\e[15~,
- kf6=\e[17~, kf7=\e[18~, kf8=\e[19~, kf9=\e[20~, kf10=\e[21~,
- kf11=\e[23~, kf12=\e[24~, kf13=\e[25~, kf14=\e[26~, kf15=\e[28~,
- kf16=\e[29~, kf17=\e[31~, kf18=\e[32~, kf19=\e[33~, kf20=\e[34~,
-
-# Find, Insert, Delete, Select, Prior (PgUp), Next (PgDn). The first set of
-# sequences are accurate. The second set lets Find/Select act like Home/End.
- kfnd=\e[1~, kich1=\e[2~, kdch1=\e[3~, kslt=\e[4~, kpp=\e[5~, knp=\e[6~,
-## kfnd=\e[7~, kich1=\e[2~, kdch1=\e[3~, kslt=\e[8~, kpp=\e[5~, knp=\e[6~,
-
-# Home (vt100 may use khome=\e[H), End, Backspace, Keypad Enter, Shift-Tab
-# The 1st set is the default. The 2nd set is based on Linux console/vt220
-# settings for Home/End and Backspace sending Delete (^?). The 3rd set gives
-# xterm's settings for Home/End.
- khome=\e[7~, kend=\e[8~, kbs=\010, kent=\eOM, kcbt=\e[Z,
-## khome=\e[1~, kend=\e[4~, kbs=\177, kent=\eOM, kcbt=\e[Z,
-## khome=\e[H, kend=\e[F, kbs=\010, kent=\eOM, kcbt=\e[Z,
-
-# Help and Begin keys
- khlp=\e[28~, kbeg=\eOu,
-# "Shifted" right and left (actually Ctrl, not Shift)
- kRIT=\e[c, kLFT=\e[d,
-# Shift-Prior/Next (PgUp/PgDn). Usually, these key combos scroll.
- kPRV=\e[5$, kNXT=\e[6$,
-# Shift-Delete/Home/End and Ctrl-End. It's a $ instead of a ~ for
-# Shift-, a ^ for Ctrl-, and @ for Ctrl-Shift-.
- kDC=\e[3$, kHOM=\e[7$, kEND=\e[8$, kel=\e[8\^,
-
-# Reset terminal, turn off all attributes
- rs1=\e>\e[1;3;4;5;6l\e[?7h\e[m\e[r\e[2J\e[H,
- rs2=\e[r\e[m\e[2J\e[H\e[?7h\e[?1;3;4;6l\e[4l\e>,
-# Init terminal
- is1=\e[?47l\e>\e[?1l,
- is2=\e[r\e[m\e[2J\e[H\e[?7h\e[?1;3;4;6l\e[4l,
-
-# Enter/leave cursor address mode. The 1st set uses the
-# secondary screen. The 2nd one doesn't.
- smcup=\e7\e[?47h, rmcup=\e[2J\e[?47l\e8,
-## smcup=\e7, rmcup=\e8,
-
-# Start/stop redirection to the printpipe
- mc4=\e[4i, mc5=\e[5i,
-
-# User-defined string capabilities
-# Cursor Position Report (CPR)
- u6=\e[%i%d;%dR,
-# Report current screen position (DSR 6) (replies with u6)
- u7=\e[6n,
-# vt100 answerback
- u8=\e[?1;2c,
-# Request identity (replies with u8) If VT100_ANS is enabled, use
-# the first value. If ENQ_ANS is enabled, use the second value.
- u9=\e[c,
-## u9=^E,
-
-# Add ANSI color support
- sgr=\e[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t^N%e^O%;,
-## sgr=\e[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m,
-
-# Mouse info packet introducer
- kmous=\e[M,
-
-# Revert to the original foreground/background pair
- op=\e[39;49m,
-# Set foreground color, background color
- setaf=\e[3%p1%dm, setab=\e[4%p1%dm,
diff --git a/source/l/ncurses/aaa_terminfo.SlackBuild b/source/l/ncurses/aaa_terminfo.SlackBuild
new file mode 100755
index 000000000..aab8dc5db
--- /dev/null
+++ b/source/l/ncurses/aaa_terminfo.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/bash
+# Copyright 2006, 2007, 2009, 2010, 2011, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# If the ncurses package is not available, we might have to build it.
+# Therefore, for use with make_world.sh, REQUIRE_GLOBAL_LOCK.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=aaa_terminfo
+# Note the version of ncurses in use:
+VERSION=${VERSION:-$(PRINT_PACKAGE_NAME=yes ./ncurses.SlackBuild | cut -f 2 -d -)}
+BUILD=${BUILD:-4}
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i586 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+if [ "$ARCH" = "x86_64" ]; then
+ LIBDIRSUFFIX="64"
+else
+ LIBDIRSUFFIX=""
+fi
+
+# If we don't have an ncurses package available in $TMP, we need to build it:
+if ! /bin/ls $TMP/$(PRINT_PACKAGE_NAME=yes $CWD/ncurses.SlackBuild) 1> /dev/null 2> /dev/null ; then
+ TMP=$TMP $CWD/ncurses.SlackBuild
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $PKG
+mkdir cruft
+cd cruft
+explodepkg $TMP/$(PRINT_PACKAGE_NAME=yes $CWD/ncurses.SlackBuild)
+sh install/doinst.sh
+cd ..
+
+# I wonder if anything still looks here?
+mkdir -p usr/lib${LIBDIRSUFFIX}
+( cd usr/lib${LIBDIRSUFFIX}
+ rm -rf terminfo
+ ln -sf /usr/share/terminfo terminfo
+)
+
+# This has been the traditional starter collection since forever.
+for dir in l n u v x ; do
+ mkdir -p usr/share/terminfo/$dir
+ ( cd usr/share/terminfo/$dir
+ cp -a $PKG/cruft/usr/share/terminfo/$dir/* .
+ )
+done
+
+# Remove dangling symlinks:
+( cd usr/share/terminfo
+ for file in $(find . -type l) ; do
+ if [ "$(readlink -e $file)" = "" ]; then
+ rm --verbose $file
+ fi
+ done
+)
+
+# Get rid of cruft:
+rm -rf $PKG/cruft
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc.aaa_terminfo > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/l/ncurses/doinst.sh b/source/l/ncurses/doinst.sh
new file mode 100644
index 000000000..762cfc7f5
--- /dev/null
+++ b/source/l/ncurses/doinst.sh
@@ -0,0 +1,3 @@
+# Remove possible residue from ncurses-5.x:
+rm -f usr/lib/libncurses.so.5
+rm -f usr/lib/libncursesw.so.5
diff --git a/source/l/ncurses/ncurses-5.9-20141206-patch.sh b/source/l/ncurses/ncurses-5.9-20141206-patch.sh
deleted file mode 100644
index 0a513594c..000000000
--- a/source/l/ncurses/ncurses-5.9-20141206-patch.sh
+++ /dev/null
@@ -1,235455 +0,0 @@
-#!/bin/sh
-# Use this script to patch ncurses 5.9 to 5.9 (20141206)
-# Run this script inside the ncurses 5.9 source directory et voila! Updated.
-
-if ( egrep '^NCURSES_MAJOR = 5$' dist.mk >/dev/null 2>&1 \
- && egrep '^NCURSES_MINOR = 9$' dist.mk >/dev/null 2>&1 \
- && egrep '^NCURSES_PATCH = 20110404$' dist.mk >/dev/null 2>&1 )
-then
- echo patching...
- rm -f mk-dlls.sh.in
- rm -f ncurses/base/memmove.c
- rm -f ncurses/tinfo/setbuf.c
- rm -f ncurses/tty/tty_display.h
- rm -f ncurses/tty/tty_input.h
-else
- echo 'This does not look like ncurses 5.9'
- exit 1
-fi
-
-
-patch -p1 -i $0 # shell command = this script = inputfile for patch
-exit
-
-# patch by Thomas E. Dickey
-# created Sun Dec 7 14:00:27 UTC 2014
-# ------------------------------------------------------------------------------
-# Ada95/aclocal.m4 | 1337
-# Ada95/configure | 5102 -
-# Ada95/configure.in | 133
-# Ada95/doc/Makefile.in | 3
-# Ada95/gen/Makefile.in | 147
-# Ada95/gen/adacurses-config.in | 14
-# Ada95/gen/gen.c | 1900
-# Ada95/gen/terminal_interface-curses-aux.ads.m4 | 73
-# Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4 | 9
-# Ada95/gen/terminal_interface-curses-forms.ads.m4 | 69
-# Ada95/gen/terminal_interface-curses-menus.ads.m4 | 54
-# Ada95/gen/terminal_interface-curses-mouse.ads.m4 | 44
-# Ada95/gen/terminal_interface-curses-panels.ads.m4 | 10
-# Ada95/gen/terminal_interface-curses-trace.ads.m4 | 54
-# Ada95/gen/terminal_interface-curses.adb.m4 | 281
-# Ada95/gen/terminal_interface-curses.ads.m4 | 507
-# Ada95/include/ncurses_defs | 7
-# Ada95/make-tar.sh | 13
-# Ada95/package/AdaCurses.spec | 6
-# Ada95/package/debian/source/format | 2
-# Ada95/samples/Makefile.in | 7
-# Ada95/samples/ncurses2-demo_forms.adb | 11
-# Ada95/samples/ncurses2-demo_pad.adb | 12
-# Ada95/samples/ncurses2-getch_test.adb | 12
-# Ada95/samples/ncurses2-overlap_test.adb | 11
-# Ada95/samples/ncurses2-trace_set.adb | 51
-# Ada95/samples/ncurses2-util.adb | 11
-# Ada95/samples/sample-explanation.adb | 12
-# Ada95/samples/sample-header_handler.adb | 13
-# Ada95/src/Makefile.in | 42
-# Ada95/src/c_varargs_to_ada.c | 6
-# Ada95/src/library.gpr | 4
-# Ada95/src/terminal_interface-curses-forms-field_types-alpha.adb | 14
-# Ada95/src/terminal_interface-curses-forms-field_types-alphanumeric.adb | 14
-# Ada95/src/terminal_interface-curses-forms-field_types-enumeration.adb | 19
-# Ada95/src/terminal_interface-curses-forms-field_types-intfield.adb | 18
-# Ada95/src/terminal_interface-curses-forms-field_types-ipv4_address.adb | 14
-# Ada95/src/terminal_interface-curses-forms-field_types-numeric.adb | 18
-# Ada95/src/terminal_interface-curses-forms-field_types-regexp.adb | 17
-# Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb | 18
-# Ada95/src/terminal_interface-curses-forms-field_types-user.adb | 19
-# Ada95/src/terminal_interface-curses-forms-field_types.adb | 56
-# Ada95/src/terminal_interface-curses-forms-field_user_data.adb | 11
-# Ada95/src/terminal_interface-curses-forms-form_user_data.adb | 11
-# Ada95/src/terminal_interface-curses-forms.adb | 352
-# Ada95/src/terminal_interface-curses-menus-item_user_data.adb | 11
-# Ada95/src/terminal_interface-curses-menus-menu_user_data.adb | 12
-# Ada95/src/terminal_interface-curses-menus.adb | 346
-# Ada95/src/terminal_interface-curses-mouse.adb | 9
-# Ada95/src/terminal_interface-curses-text_io.adb | 8
-# Ada95/src/terminal_interface-curses-trace.adb_p | 37
-# INSTALL | 205
-# MANIFEST | 67
-# Makefile.in | 30
-# NEWS | 1879
-# README | 17
-# README.MinGW | 95
-# aclocal.m4 | 2058
-# announce.html.in | 160
-# c++/Makefile.in | 121
-# c++/cursesapp.h | 21
-# c++/cursesf.cc | 12
-# c++/cursesf.h | 26
-# c++/cursesm.cc | 10
-# c++/cursesm.h | 23
-# c++/cursesmain.cc | 6
-# c++/cursesp.h | 15
-# c++/cursespad.cc | 56
-# c++/cursesw.cc | 23
-# c++/cursesw.h | 41
-# c++/cursslk.cc | 9
-# c++/demo.cc | 9
-# c++/etip.h.in | 18
-# c++/internal.h | 6
-# c++/modules | 21
-# config.guess | 508
-# config.sub | 228
-# configure | 9647 +-
-# configure.in | 753
-# dist.mk | 37
-# doc/html/Ada95.html | 471
-# doc/html/NCURSES-Programming-HOWTO.html |13472 ++--
-# doc/html/ada/files.htm | 16
-# doc/html/ada/files/T.htm | 7
-# doc/html/ada/funcs.htm | 16
-# doc/html/ada/funcs/A.htm | 39
-# doc/html/ada/funcs/B.htm | 32
-# doc/html/ada/funcs/C.htm | 87
-# doc/html/ada/funcs/D.htm | 80
-# doc/html/ada/funcs/E.htm | 26
-# doc/html/ada/funcs/F.htm | 98
-# doc/html/ada/funcs/G.htm | 128
-# doc/html/ada/funcs/H.htm | 32
-# doc/html/ada/funcs/I.htm | 88
-# doc/html/ada/funcs/K.htm | 18
-# doc/html/ada/funcs/L.htm | 25
-# doc/html/ada/funcs/M.htm | 84
-# doc/html/ada/funcs/N.htm | 52
-# doc/html/ada/funcs/O.htm | 14
-# doc/html/ada/funcs/P.htm | 50
-# doc/html/ada/funcs/Q.htm | 8
-# doc/html/ada/funcs/R.htm | 64
-# doc/html/ada/funcs/S.htm | 304
-# doc/html/ada/funcs/T.htm | 37
-# doc/html/ada/funcs/U.htm | 34
-# doc/html/ada/funcs/V.htm | 12
-# doc/html/ada/funcs/W.htm | 88
-# doc/html/ada/index.htm | 5
-# doc/html/ada/main.htm | 17
-# doc/html/ada/terminal_interface-curses-aux__adb.htm | 186
-# doc/html/ada/terminal_interface-curses-aux__ads.htm | 255
-# doc/html/ada/terminal_interface-curses-forms-field_types-alpha__adb.htm | 122
-# doc/html/ada/terminal_interface-curses-forms-field_types-alpha__ads.htm | 112
-# doc/html/ada/terminal_interface-curses-forms-field_types-alphanumeric__adb.htm | 122
-# doc/html/ada/terminal_interface-curses-forms-field_types-alphanumeric__ads.htm | 112
-# doc/html/ada/terminal_interface-curses-forms-field_types-enumeration-ada__adb.htm | 126
-# doc/html/ada/terminal_interface-curses-forms-field_types-enumeration-ada__ads.htm | 122
-# doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__adb.htm | 157
-# doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__ads.htm | 164
-# doc/html/ada/terminal_interface-curses-forms-field_types-intfield__adb.htm | 130
-# doc/html/ada/terminal_interface-curses-forms-field_types-intfield__ads.htm | 116
-# doc/html/ada/terminal_interface-curses-forms-field_types-ipv4_address__adb.htm | 122
-# doc/html/ada/terminal_interface-curses-forms-field_types-ipv4_address__ads.htm | 110
-# doc/html/ada/terminal_interface-curses-forms-field_types-numeric__adb.htm | 134
-# doc/html/ada/terminal_interface-curses-forms-field_types-numeric__ads.htm | 116
-# doc/html/ada/terminal_interface-curses-forms-field_types-regexp__adb.htm | 127
-# doc/html/ada/terminal_interface-curses-forms-field_types-regexp__ads.htm | 114
-# doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__adb.htm | 174
-# doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__ads.htm | 170
-# doc/html/ada/terminal_interface-curses-forms-field_types-user__adb.htm | 207
-# doc/html/ada/terminal_interface-curses-forms-field_types-user__ads.htm | 182
-# doc/html/ada/terminal_interface-curses-forms-field_types__adb.htm | 401
-# doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm | 465
-# doc/html/ada/terminal_interface-curses-forms-field_user_data__adb.htm | 151
-# doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm | 144
-# doc/html/ada/terminal_interface-curses-forms-form_user_data__adb.htm | 157
-# doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm | 144
-# doc/html/ada/terminal_interface-curses-forms__adb.htm | 1648
-# doc/html/ada/terminal_interface-curses-forms__ads.htm | 1447
-# doc/html/ada/terminal_interface-curses-menus-item_user_data__adb.htm | 131
-# doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm | 154
-# doc/html/ada/terminal_interface-curses-menus-menu_user_data__adb.htm | 130
-# doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm | 144
-# doc/html/ada/terminal_interface-curses-menus__adb.htm | 1286
-# doc/html/ada/terminal_interface-curses-menus__ads.htm | 1276
-# doc/html/ada/terminal_interface-curses-mouse__adb.htm | 312
-# doc/html/ada/terminal_interface-curses-mouse__ads.htm | 406
-# doc/html/ada/terminal_interface-curses-panels-user_data__adb.htm | 134
-# doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm | 144
-# doc/html/ada/terminal_interface-curses-panels__adb.htm | 230
-# doc/html/ada/terminal_interface-curses-panels__ads.htm | 283
-# doc/html/ada/terminal_interface-curses-putwin__adb.htm | 136
-# doc/html/ada/terminal_interface-curses-putwin__ads.htm | 106
-# doc/html/ada/terminal_interface-curses-termcap__adb.htm | 214
-# doc/html/ada/terminal_interface-curses-termcap__ads.htm | 170
-# doc/html/ada/terminal_interface-curses-terminfo__adb.htm | 204
-# doc/html/ada/terminal_interface-curses-terminfo__ads.htm | 166
-# doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm | 158
-# doc/html/ada/terminal_interface-curses-text_io-aux__ads.htm | 124
-# doc/html/ada/terminal_interface-curses-text_io-complex_io__adb.htm | 124
-# doc/html/ada/terminal_interface-curses-text_io-complex_io__ads.htm | 126
-# doc/html/ada/terminal_interface-curses-text_io-decimal_io__adb.htm | 132
-# doc/html/ada/terminal_interface-curses-text_io-decimal_io__ads.htm | 136
-# doc/html/ada/terminal_interface-curses-text_io-enumeration_io__adb.htm | 128
-# doc/html/ada/terminal_interface-curses-text_io-enumeration_io__ads.htm | 128
-# doc/html/ada/terminal_interface-curses-text_io-fixed_io__adb.htm | 132
-# doc/html/ada/terminal_interface-curses-text_io-fixed_io__ads.htm | 136
-# doc/html/ada/terminal_interface-curses-text_io-float_io__adb.htm | 132
-# doc/html/ada/terminal_interface-curses-text_io-float_io__ads.htm | 136
-# doc/html/ada/terminal_interface-curses-text_io-integer_io__adb.htm | 126
-# doc/html/ada/terminal_interface-curses-text_io-integer_io__ads.htm | 128
-# doc/html/ada/terminal_interface-curses-text_io-modular_io__adb.htm | 126
-# doc/html/ada/terminal_interface-curses-text_io-modular_io__ads.htm | 128
-# doc/html/ada/terminal_interface-curses-text_io__adb.htm | 340
-# doc/html/ada/terminal_interface-curses-text_io__ads.htm | 230
-# doc/html/ada/terminal_interface-curses-trace__adb.htm | 114
-# doc/html/ada/terminal_interface-curses-trace__ads.htm | 224
-# doc/html/ada/terminal_interface-curses__adb.htm | 3513 -
-# doc/html/ada/terminal_interface-curses__ads.htm | 3911 -
-# doc/html/ada/terminal_interface__ads.htm | 108
-# doc/html/announce.html | 4
-# doc/html/hackguide.html | 6
-# doc/html/index.html | 6
-# doc/html/man/adacurses-config.1.html | 62
-# doc/html/man/captoinfo.1m.html | 13
-# doc/html/man/clear.1.html | 16
-# doc/html/man/curs_add_wch.3x.html | 32
-# doc/html/man/curs_add_wchstr.3x.html | 81
-# doc/html/man/curs_addch.3x.html | 51
-# doc/html/man/curs_addchstr.3x.html | 69
-# doc/html/man/curs_addstr.3x.html | 49
-# doc/html/man/curs_addwstr.3x.html | 56
-# doc/html/man/curs_attr.3x.html | 90
-# doc/html/man/curs_beep.3x.html | 2
-# doc/html/man/curs_bkgd.3x.html | 2
-# doc/html/man/curs_bkgrnd.3x.html | 8
-# doc/html/man/curs_border.3x.html | 2
-# doc/html/man/curs_border_set.3x.html | 8
-# doc/html/man/curs_clear.3x.html | 2
-# doc/html/man/curs_color.3x.html | 2
-# doc/html/man/curs_delch.3x.html | 2
-# doc/html/man/curs_deleteln.3x.html | 2
-# doc/html/man/curs_extend.3x.html | 2
-# doc/html/man/curs_get_wch.3x.html | 8
-# doc/html/man/curs_get_wstr.3x.html | 8
-# doc/html/man/curs_getcchar.3x.html | 10
-# doc/html/man/curs_getch.3x.html | 56
-# doc/html/man/curs_getstr.3x.html | 2
-# doc/html/man/curs_getyx.3x.html | 2
-# doc/html/man/curs_in_wch.3x.html | 2
-# doc/html/man/curs_in_wchstr.3x.html | 8
-# doc/html/man/curs_inch.3x.html | 2
-# doc/html/man/curs_inchstr.3x.html | 2
-# doc/html/man/curs_initscr.3x.html | 79
-# doc/html/man/curs_inopts.3x.html | 60
-# doc/html/man/curs_ins_wch.3x.html | 2
-# doc/html/man/curs_ins_wstr.3x.html | 8
-# doc/html/man/curs_insch.3x.html | 2
-# doc/html/man/curs_insstr.3x.html | 2
-# doc/html/man/curs_instr.3x.html | 2
-# doc/html/man/curs_inwstr.3x.html | 8
-# doc/html/man/curs_kernel.3x.html | 2
-# doc/html/man/curs_legacy.3x.html | 2
-# doc/html/man/curs_memleaks.3x.html | 2
-# doc/html/man/curs_mouse.3x.html | 19
-# doc/html/man/curs_move.3x.html | 2
-# doc/html/man/curs_opaque.3x.html | 12
-# doc/html/man/curs_outopts.3x.html | 2
-# doc/html/man/curs_overlay.3x.html | 8
-# doc/html/man/curs_pad.3x.html | 2
-# doc/html/man/curs_print.3x.html | 2
-# doc/html/man/curs_printw.3x.html | 8
-# doc/html/man/curs_refresh.3x.html | 2
-# doc/html/man/curs_scanw.3x.html | 8
-# doc/html/man/curs_scr_dump.3x.html | 4
-# doc/html/man/curs_scroll.3x.html | 2
-# doc/html/man/curs_slk.3x.html | 2
-# doc/html/man/curs_sp_funcs.3x.html | 62
-# doc/html/man/curs_termattrs.3x.html | 12
-# doc/html/man/curs_termcap.3x.html | 133
-# doc/html/man/curs_terminfo.3x.html | 309
-# doc/html/man/curs_threads.3x.html | 13
-# doc/html/man/curs_touch.3x.html | 2
-# doc/html/man/curs_trace.3x.html | 2
-# doc/html/man/curs_util.3x.html | 166
-# doc/html/man/curs_variables.3x.html | 20
-# doc/html/man/curs_window.3x.html | 111
-# doc/html/man/default_colors.3x.html | 4
-# doc/html/man/define_key.3x.html | 2
-# doc/html/man/form.3x.html | 25
-# doc/html/man/form_cursor.3x.html | 2
-# doc/html/man/form_data.3x.html | 2
-# doc/html/man/form_driver.3x.html | 4
-# doc/html/man/form_field.3x.html | 8
-# doc/html/man/form_field_attributes.3x.html | 2
-# doc/html/man/form_field_buffer.3x.html | 6
-# doc/html/man/form_field_info.3x.html | 2
-# doc/html/man/form_field_just.3x.html | 2
-# doc/html/man/form_field_new.3x.html | 2
-# doc/html/man/form_field_opts.3x.html | 64
-# doc/html/man/form_field_userptr.3x.html | 2
-# doc/html/man/form_field_validation.3x.html | 2
-# doc/html/man/form_fieldtype.3x.html | 6
-# doc/html/man/form_hook.3x.html | 2
-# doc/html/man/form_new.3x.html | 2
-# doc/html/man/form_new_page.3x.html | 2
-# doc/html/man/form_opts.3x.html | 2
-# doc/html/man/form_page.3x.html | 2
-# doc/html/man/form_post.3x.html | 2
-# doc/html/man/form_requestname.3x.html | 2
-# doc/html/man/form_userptr.3x.html | 2
-# doc/html/man/form_variables.3x.html | 8
-# doc/html/man/form_win.3x.html | 2
-# doc/html/man/index.html | 121
-# doc/html/man/infocmp.1m.html | 290
-# doc/html/man/infotocap.1m.html | 8
-# doc/html/man/key_defined.3x.html | 2
-# doc/html/man/keybound.3x.html | 2
-# doc/html/man/keyok.3x.html | 2
-# doc/html/man/legacy_coding.3x.html | 2
-# doc/html/man/menu.3x.html | 25
-# doc/html/man/menu_attributes.3x.html | 2
-# doc/html/man/menu_cursor.3x.html | 2
-# doc/html/man/menu_driver.3x.html | 50
-# doc/html/man/menu_format.3x.html | 2
-# doc/html/man/menu_hook.3x.html | 2
-# doc/html/man/menu_items.3x.html | 8
-# doc/html/man/menu_mark.3x.html | 2
-# doc/html/man/menu_new.3x.html | 2
-# doc/html/man/menu_opts.3x.html | 2
-# doc/html/man/menu_pattern.3x.html | 2
-# doc/html/man/menu_post.3x.html | 2
-# doc/html/man/menu_requestname.3x.html | 2
-# doc/html/man/menu_spacing.3x.html | 2
-# doc/html/man/menu_userptr.3x.html | 2
-# doc/html/man/menu_win.3x.html | 2
-# doc/html/man/mitem_current.3x.html | 2
-# doc/html/man/mitem_name.3x.html | 2
-# doc/html/man/mitem_new.3x.html | 2
-# doc/html/man/mitem_opts.3x.html | 2
-# doc/html/man/mitem_userptr.3x.html | 2
-# doc/html/man/mitem_value.3x.html | 2
-# doc/html/man/mitem_visible.3x.html | 2
-# doc/html/man/ncurses.3x.html | 663
-# doc/html/man/ncurses5-config.1.html | 9
-# doc/html/man/panel.3x.html | 42
-# doc/html/man/resizeterm.3x.html | 57
-# doc/html/man/tabs.1.html | 44
-# doc/html/man/term.5.html | 2
-# doc/html/man/term.7.html | 12
-# doc/html/man/term_variables.3x.html | 20
-# doc/html/man/terminfo.5.html | 1481
-# doc/html/man/tic.1m.html | 334
-# doc/html/man/toe.1m.html | 18
-# doc/html/man/tput.1.html | 136
-# doc/html/man/tset.1.html | 70
-# doc/html/man/wresize.3x.html | 2
-# doc/html/ncurses-intro.html | 7
-# doc/ncurses-intro.doc | 1
-# form/Makefile.in | 17
-# form/fld_arg.c | 6
-# form/fld_def.c | 29
-# form/fld_dup.c | 8
-# form/fld_ftchoice.c | 6
-# form/fld_ftlink.c | 10
-# form/fld_just.c | 6
-# form/fld_link.c | 8
-# form/fld_max.c | 10
-# form/fld_move.c | 8
-# form/fld_page.c | 8
-# form/fld_stat.c | 8
-# form/form.h | 12
-# form/form.priv.h | 29
-# form/frm_data.c | 6
-# form/frm_def.c | 24
-# form/frm_driver.c | 500
-# form/frm_hook.c | 6
-# form/frm_opts.c | 18
-# form/frm_page.c | 6
-# form/frm_post.c | 8
-# form/frm_req_name.c | 21
-# form/fty_generic.c | 6
-# form/fty_int.c | 7
-# form/fty_num.c | 7
-# form/fty_regex.c | 14
-# form/llib-lformtw | 11
-# form/llib-lformw | 11
-# include/Caps | 18
-# include/Caps.aix4 | 18
-# include/Caps.hpux11 | 18
-# include/Caps.keys | 26
-# include/Caps.osf1r5 | 6
-# include/MKkey_defs.sh | 9
-# include/MKparametrized.sh | 15
-# include/MKterm.h.awk.in | 46
-# include/Makefile.in | 7
-# include/curses.h.in | 303
-# include/curses.tail | 4
-# include/curses.wide | 152
-# include/hashed_db.h | 4
-# include/headers | 18
-# include/nc_alloc.h | 14
-# include/nc_tparm.h | 8
-# include/ncurses_defs | 27
-# include/ncurses_dll.h.in | 20
-# include/ncurses_mingw.h | 138
-# include/term_entry.h | 68
-# include/tic.h | 35
-# man/MKada_config.in | 69
-# man/Makefile.in | 8
-# man/clear.1 | 11
-# man/curs_add_wch.3x | 6
-# man/curs_add_wchstr.3x | 64
-# man/curs_addch.3x | 27
-# man/curs_addchstr.3x | 50
-# man/curs_addstr.3x | 38
-# man/curs_addwstr.3x | 35
-# man/curs_attr.3x | 59
-# man/curs_bkgrnd.3x | 6
-# man/curs_border_set.3x | 6
-# man/curs_color.3x | 180
-# man/curs_get_wch.3x | 6
-# man/curs_get_wstr.3x | 6
-# man/curs_getcchar.3x | 6
-# man/curs_getch.3x | 30
-# man/curs_in_wchstr.3x | 6
-# man/curs_initscr.3x | 112
-# man/curs_inopts.3x | 63
-# man/curs_ins_wstr.3x | 6
-# man/curs_inwstr.3x | 6
-# man/curs_mouse.3x | 33
-# man/curs_opaque.3x | 18
-# man/curs_overlay.3x | 26
-# man/curs_sp_funcs.3x | 6
-# man/curs_termcap.3x | 61
-# man/curs_terminfo.3x | 207
-# man/curs_threads.3x | 9
-# man/curs_util.3x | 112
-# man/curs_variables.3x | 9
-# man/curs_window.3x | 109
-# man/form.3x | 10
-# man/form_field.3x | 6
-# man/form_field_opts.3x | 49
-# man/form_variables.3x | 6
-# man/infocmp.1m | 178
-# man/menu.3x | 10
-# man/menu_items.3x | 6
-# man/ncurses.3x | 198
-# man/resizeterm.3x | 16
-# man/tabs.1 | 24
-# man/term.7 | 6
-# man/term_variables.3x | 14
-# man/terminfo.head | 15
-# man/terminfo.tail | 404
-# man/tic.1m | 225
-# man/toe.1m | 21
-# man/tput.1 | 35
-# man/tset.1 | 103
-# menu/Makefile.in | 17
-# menu/m_attribs.c | 6
-# menu/m_driver.c | 12
-# menu/m_format.c | 20
-# menu/m_global.c | 42
-# menu/m_hook.c | 6
-# menu/m_item_new.c | 21
-# menu/m_pad.c | 6
-# menu/m_post.c | 40
-# menu/m_req_name.c | 19
-# menu/m_spacing.c | 10
-# menu/menu.priv.h | 27
-# menu/mf_common.h | 18
-# misc/Makefile.in | 17
-# misc/gen-pkgconfig.in | 88
-# misc/gen_edit.sh | 72
-# misc/ncurses-config.in | 49
-# misc/run_tic.in | 7
-# misc/terminfo.src |32219 +++++-----
-# mk-0th.awk | 91
-# mk-1st.awk | 122
-# mk-hdr.awk | 16
-# ncurses-5.9-20141206/Ada95/src/c_threaded_variables.c | 56
-# ncurses-5.9-20141206/Ada95/src/c_threaded_variables.h | 46
-# ncurses-5.9-20141206/COPYING | 28
-# ncurses-5.9-20141206/VERSION | 1
-# ncurses-5.9-20141206/doc/html/ada/terminal_interface-curses_constants__ads.htm | 405
-# ncurses-5.9-20141206/include/nc_string.h | 77
-# ncurses-5.9-20141206/include/nc_termios.h | 161
-# ncurses-5.9-20141206/man/manhtml.aliases | 16
-# ncurses-5.9-20141206/man/manhtml.externs | 24
-# ncurses-5.9-20141206/ncurses/llib-ltic | 212
-# ncurses-5.9-20141206/ncurses/llib-ltict | 212
-# ncurses-5.9-20141206/ncurses/llib-ltictw | 212
-# ncurses-5.9-20141206/ncurses/llib-lticw | 212
-# ncurses-5.9-20141206/ncurses/llib-ltinfo | 1526
-# ncurses-5.9-20141206/ncurses/llib-ltinfot | 1635
-# ncurses-5.9-20141206/ncurses/llib-ltinfotw | 1668
-# ncurses-5.9-20141206/ncurses/llib-ltinfow | 1559
-# ncurses-5.9-20141206/ncurses/tinfo/obsolete.c | 239
-# ncurses-5.9-20141206/ncurses/widechar/widechars.c | 152
-# ncurses-5.9-20141206/package/debian-mingw/changelog | 11
-# ncurses-5.9-20141206/package/debian-mingw/compat | 1
-# ncurses-5.9-20141206/package/debian-mingw/control | 16
-# ncurses-5.9-20141206/package/debian-mingw/copyright | 112
-# ncurses-5.9-20141206/package/debian-mingw/rules | 140
-# ncurses-5.9-20141206/package/debian-mingw/source/format | 1
-# ncurses-5.9-20141206/package/debian-mingw/watch | 4
-# ncurses-5.9-20141206/package/debian-mingw64/changelog | 11
-# ncurses-5.9-20141206/package/debian-mingw64/compat | 1
-# ncurses-5.9-20141206/package/debian-mingw64/control | 16
-# ncurses-5.9-20141206/package/debian-mingw64/copyright | 112
-# ncurses-5.9-20141206/package/debian-mingw64/rules | 140
-# ncurses-5.9-20141206/package/debian-mingw64/source/format | 1
-# ncurses-5.9-20141206/package/debian-mingw64/watch | 4
-# ncurses-5.9-20141206/package/debian/changelog | 11
-# ncurses-5.9-20141206/package/debian/compat | 1
-# ncurses-5.9-20141206/package/debian/control | 16
-# ncurses-5.9-20141206/package/debian/copyright | 112
-# ncurses-5.9-20141206/package/debian/rules | 126
-# ncurses-5.9-20141206/package/debian/source/format | 1
-# ncurses-5.9-20141206/package/debian/watch | 4
-# ncurses-5.9-20141206/package/mingw-ncurses.nsi | 190
-# ncurses-5.9-20141206/package/mingw-ncurses.spec | 143
-# ncurses-5.9-20141206/package/ncurses.map | 1109
-# ncurses-5.9-20141206/package/ncurses.spec | 95
-# ncurses-5.9-20141206/package/ncurses.sym | 997
-# ncurses-5.9-20141206/package/ncursest.map | 1086
-# ncurses-5.9-20141206/package/ncursest.sym | 1001
-# ncurses-5.9-20141206/package/ncursestw.map | 1206
-# ncurses-5.9-20141206/package/ncursestw.sym | 1121
-# ncurses-5.9-20141206/package/ncursesw.map | 1220
-# ncurses-5.9-20141206/package/ncursesw.sym | 1111
-# ncurses-5.9-20141206/progs/tparm_type.c | 68
-# ncurses-5.9-20141206/progs/tparm_type.h | 52
-# ncurses-5.9-20141206/test/color_name.h | 103
-# ncurses-5.9-20141206/test/demo_forms.txt | 20
-# ncurses-5.9-20141206/test/dots_curses.c | 151
-# ncurses-5.9-20141206/test/dots_termcap.c | 254
-# ncurses-5.9-20141206/test/form_driver_w.c | 150
-# ncurses-5.9-20141206/test/package/mingw-ncurses-examples.spec | 109
-# ncurses-5.9-20141206/test/test_vid_puts.c | 148
-# ncurses-5.9-20141206/test/test_vidputs.c | 148
-# ncurses-5.9-20141206/test/widechars.h | 71
-# ncurses/Makefile.in | 43
-# ncurses/base/MKkeyname.awk | 30
-# ncurses/base/MKlib_gen.sh | 64
-# ncurses/base/MKunctrl.awk | 6
-# ncurses/base/define_key.c | 6
-# ncurses/base/keybound.c | 9
-# ncurses/base/keyok.c | 66
-# ncurses/base/lib_addch.c | 18
-# ncurses/base/lib_addstr.c | 10
-# ncurses/base/lib_beep.c | 13
-# ncurses/base/lib_bkgd.c | 13
-# ncurses/base/lib_chgat.c | 16
-# ncurses/base/lib_color.c | 176
-# ncurses/base/lib_colorset.c | 8
-# ncurses/base/lib_dft_fgbg.c | 7
-# ncurses/base/lib_driver.c | 24
-# ncurses/base/lib_endwin.c | 8
-# ncurses/base/lib_flash.c | 22
-# ncurses/base/lib_freeall.c | 20
-# ncurses/base/lib_getch.c | 68
-# ncurses/base/lib_getstr.c | 6
-# ncurses/base/lib_initscr.c | 8
-# ncurses/base/lib_insch.c | 34
-# ncurses/base/lib_instr.c | 16
-# ncurses/base/lib_mouse.c | 931
-# ncurses/base/lib_newterm.c | 25
-# ncurses/base/lib_newwin.c | 17
-# ncurses/base/lib_overlay.c | 21
-# ncurses/base/lib_printw.c | 34
-# ncurses/base/lib_refresh.c | 17
-# ncurses/base/lib_restart.c | 10
-# ncurses/base/lib_scanw.c | 6
-# ncurses/base/lib_screen.c | 19
-# ncurses/base/lib_scroll.c | 8
-# ncurses/base/lib_set_term.c | 60
-# ncurses/base/lib_slkatr_set.c | 10
-# ncurses/base/lib_slkcolor.c | 10
-# ncurses/base/lib_slkrefr.c | 26
-# ncurses/base/lib_slkset.c | 17
-# ncurses/base/lib_touch.c | 6
-# ncurses/base/lib_ungetch.c | 11
-# ncurses/base/resizeterm.c | 89
-# ncurses/base/safe_sprintf.c | 20
-# ncurses/base/vsscanf.c | 8
-# ncurses/base/wresize.c | 9
-# ncurses/build.priv.h | 6
-# ncurses/curses.priv.h | 436
-# ncurses/fifo_defs.h | 46
-# ncurses/llib-lncurses | 456
-# ncurses/llib-lncursest | 424
-# ncurses/llib-lncursestw | 562
-# ncurses/llib-lncursesw | 568
-# ncurses/modules | 8
-# ncurses/tinfo/MKcaptab.sh | 10
-# ncurses/tinfo/access.c | 43
-# ncurses/tinfo/alloc_entry.c | 55
-# ncurses/tinfo/alloc_ttype.c | 55
-# ncurses/tinfo/captoinfo.c | 212
-# ncurses/tinfo/comp_error.c | 20
-# ncurses/tinfo/comp_expand.c | 19
-# ncurses/tinfo/comp_parse.c | 187
-# ncurses/tinfo/comp_scan.c | 171
-# ncurses/tinfo/db_iterator.c | 431
-# ncurses/tinfo/doalloc.c | 21
-# ncurses/tinfo/entries.c | 11
-# ncurses/tinfo/getenv_num.c | 21
-# ncurses/tinfo/hashed_db.c | 165
-# ncurses/tinfo/home_terminfo.c | 10
-# ncurses/tinfo/lib_acs.c | 9
-# ncurses/tinfo/lib_baudrate.c | 71
-# ncurses/tinfo/lib_cur_term.c | 24
-# ncurses/tinfo/lib_data.c | 15
-# ncurses/tinfo/lib_has_cap.c | 8
-# ncurses/tinfo/lib_napms.c | 12
-# ncurses/tinfo/lib_options.c | 57
-# ncurses/tinfo/lib_print.c | 10
-# ncurses/tinfo/lib_raw.c | 35
-# ncurses/tinfo/lib_setup.c | 178
-# ncurses/tinfo/lib_termcap.c | 51
-# ncurses/tinfo/lib_tgoto.c | 9
-# ncurses/tinfo/lib_ti.c | 16
-# ncurses/tinfo/lib_tparm.c | 86
-# ncurses/tinfo/lib_tputs.c | 92
-# ncurses/tinfo/lib_ttyflags.c | 24
-# ncurses/tinfo/make_hash.c | 52
-# ncurses/tinfo/make_keys.c | 6
-# ncurses/tinfo/name_match.c | 42
-# ncurses/tinfo/parse_entry.c | 40
-# ncurses/tinfo/read_entry.c | 391
-# ncurses/tinfo/read_termcap.c | 89
-# ncurses/tinfo/strings.c | 8
-# ncurses/tinfo/tinfo_driver.c | 261
-# ncurses/tinfo/trim_sgr0.c | 85
-# ncurses/tinfo/write_entry.c | 110
-# ncurses/trace/lib_trace.c | 23
-# ncurses/trace/lib_traceatr.c | 49
-# ncurses/trace/lib_tracebits.c | 24
-# ncurses/trace/lib_tracechr.c | 15
-# ncurses/trace/lib_tracedmp.c | 8
-# ncurses/trace/lib_tracemse.c | 48
-# ncurses/trace/trace_buf.c | 11
-# ncurses/trace/trace_tries.c | 37
-# ncurses/trace/varargs.c | 23
-# ncurses/trace/visbuf.c | 52
-# ncurses/tty/hardscroll.c | 24
-# ncurses/tty/hashmap.c | 8
-# ncurses/tty/lib_mvcur.c | 126
-# ncurses/tty/lib_tstp.c | 57
-# ncurses/tty/lib_twait.c | 66
-# ncurses/tty/lib_vidattr.c | 95
-# ncurses/tty/tty_update.c | 316
-# ncurses/wcwidth.h | 21
-# ncurses/widechar/lib_box_set.c | 6
-# ncurses/widechar/lib_cchar.c | 24
-# ncurses/widechar/lib_erasewchar.c | 8
-# ncurses/widechar/lib_get_wch.c | 9
-# ncurses/widechar/lib_get_wstr.c | 8
-# ncurses/widechar/lib_ins_wch.c | 6
-# ncurses/widechar/lib_inwstr.c | 11
-# ncurses/widechar/lib_slk_wset.c | 30
-# ncurses/widechar/lib_unget_wch.c | 6
-# ncurses/widechar/lib_vid_attr.c | 85
-# ncurses/widechar/lib_wacs.c | 38
-# ncurses/widechar/lib_wunctrl.c | 17
-# ncurses/win32con/gettimeofday.c | 7
-# ncurses/win32con/win_driver.c | 1734
-# panel/Makefile.in | 18
-# panel/p_above.c | 6
-# panel/p_below.c | 6
-# panel/panel.c | 12
-# panel/panel.priv.h | 12
-# progs/Makefile.in | 40
-# progs/capconvert | 24
-# progs/clear.c | 12
-# progs/dump_entry.c | 258
-# progs/dump_entry.h | 19
-# progs/infocmp.c | 492
-# progs/modules | 9
-# progs/progs.priv.h | 27
-# progs/tabs.c | 146
-# progs/tic.c | 890
-# progs/toe.c | 456
-# progs/tput.c | 56
-# progs/transform.c | 16
-# progs/tset.c | 125
-# test/Makefile.in | 19
-# test/README | 52
-# test/aclocal.m4 | 1281
-# test/background.c | 230
-# test/blue.c | 12
-# test/bs.c | 46
-# test/cardfile.c | 30
-# test/chgat.c | 6
-# test/clip_printw.c | 11
-# test/color_set.c | 10
-# test/configure |19108 +++--
-# test/configure.in | 201
-# test/demo_defkey.c | 12
-# test/demo_forms.c | 224
-# test/demo_menus.c | 318
-# test/demo_panels.c | 6
-# test/demo_termcap.c | 758
-# test/demo_terminfo.c | 799
-# test/ditto.c | 10
-# test/dots.c | 24
-# test/dots_mvcur.c | 25
-# test/echochar.c | 4
-# test/edit_field.c | 69
-# test/edit_field.h | 8
-# test/filter.c | 10
-# test/firework.c | 18
-# test/gdc.c | 143
-# test/hanoi.c | 33
-# test/hashtest.c | 6
-# test/inchs.c | 16
-# test/ins_wide.c | 38
-# test/insdelln.c | 10
-# test/inserts.c | 29
-# test/key_names.c | 6
-# test/knight.c | 70
-# test/linedata.h | 6
-# test/make-tar.sh | 13
-# test/modules | 11
-# test/movewindow.c | 227
-# test/ncurses.c | 1197
-# test/newdemo.c | 23
-# test/package/debian/source/format | 2
-# test/package/ncurses-examples.spec | 4
-# test/programs | 9
-# test/railroad.c | 12
-# test/rain.c | 13
-# test/redraw.c | 6
-# test/tclock.c | 14
-# test/test.priv.h | 175
-# test/test_add_wchstr.c | 37
-# test/test_addchstr.c | 31
-# test/test_addstr.c | 29
-# test/test_addwstr.c | 38
-# test/test_getstr.c | 15
-# test/testaddch.c | 16
-# test/testcurs.c | 66
-# test/view.c | 88
-# test/worm.c | 31
-# test/xmas.c | 6
-# 706 files changed, 104950 insertions(+), 63097 deletions(-)
-# ------------------------------------------------------------------------------
-# Please remove the following files before applying this patch.
-# (You can feed this patch to 'sh' to do so.)
-
-rm -f mk-dlls.sh.in
-rm -f ncurses/base/memmove.c
-rm -f ncurses/tinfo/setbuf.c
-rm -f ncurses/tty/tty_display.h
-rm -f ncurses/tty/tty_input.h
-exit
-
-Index: Ada95/aclocal.m4
-Prereq: 1.24
---- ncurses-5.9/Ada95/aclocal.m4 2011-03-31 23:32:36.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/aclocal.m4 2014-12-06 13:38:19.000000000 +0000
-@@ -1,5 +1,5 @@
- dnl***************************************************************************
--dnl Copyright (c) 2010,2011 Free Software Foundation, Inc. *
-+dnl Copyright (c) 2010-2013,2014 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.93 2014/12/06 13:38:19 tom Exp $
- dnl Macros used in NCURSES Ada95 auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES. The copyright on
-@@ -39,7 +39,33 @@
- dnl
- dnl ---------------------------------------------------------------------------
- dnl ---------------------------------------------------------------------------
--dnl CF_ADA_INCLUDE_DIRS version: 6 updated: 2010/02/26 19:52:07
-+dnl CF_ACVERSION_CHECK version: 5 updated: 2014/06/04 19:11:49
-+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([AC_ACVERSION], ,[ifdef([AC_AUTOCONF_VERSION],[m4_copy([AC_AUTOCONF_VERSION],[AC_ACVERSION])],[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])])dnl
-+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: 3 updated: 2012/10/03 18:39:53
-+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: 8 updated: 2013/10/14 04:24:07
- dnl -------------------
- dnl Construct the list of include-options for the C programs in the Ada95
- dnl binding.
-@@ -53,7 +79,7 @@
- ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
- elif test "$includedir" != "/usr/include"; then
- if test "$includedir" = '${prefix}/include' ; then
-- if test $prefix != /usr ; then
-+ if test x$prefix != x/usr ; then
- ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
- fi
- else
-@@ -71,7 +97,7 @@
- AC_SUBST(ADAFLAGS)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
-+dnl CF_ADD_CFLAGS version: 11 updated: 2014/07/22 05:32:57
- dnl -------------
- dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
- dnl The second parameter if given makes this macro verbose.
-@@ -96,7 +122,7 @@
- -D*)
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'`
-
-- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=yes
-
-@@ -133,7 +159,7 @@
-
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
-
-- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=no
- ;;
-@@ -260,15 +286,33 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ADD_LIBS version: 1 updated: 2010/06/02 05:03:05
-+dnl CF_ADD_LIBS version: 2 updated: 2014/07/13 14:33:27
- dnl -----------
--dnl Add one or more libraries, used to enforce consistency.
-+dnl Add one or more libraries, used to enforce consistency. Libraries are
-+dnl prepended to an existing list, since their dependencies are assumed to
-+dnl already exist in the list.
- dnl
- dnl $1 = libraries to add, with the "-l", etc.
- dnl $2 = variable to update (default $LIBS)
--AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl
-+AC_DEFUN([CF_ADD_LIBS],[
-+cf_add_libs="$1"
-+# Filter out duplicates - this happens with badly-designed ".pc" files...
-+for cf_add_1lib in [$]ifelse($2,,LIBS,[$2])
-+do
-+ for cf_add_2lib in $cf_add_libs
-+ do
-+ if test "x$cf_add_1lib" = "x$cf_add_2lib"
-+ then
-+ cf_add_1lib=
-+ break
-+ fi
-+ done
-+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+done
-+ifelse($2,,LIBS,[$2])="$cf_add_libs"
-+])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ADD_SUBDIR_PATH version: 3 updated: 2010/07/03 20:58:12
-+dnl CF_ADD_SUBDIR_PATH version: 4 updated: 2013/10/08 17:47:05
- dnl ------------------
- dnl Append to a search-list for a nonstandard header/lib-file
- dnl $1 = the variable to return as result
-@@ -278,9 +322,9 @@
- dnl $5 = a directory that we do not want $4 to match
- AC_DEFUN([CF_ADD_SUBDIR_PATH],
- [
--test "$4" != "$5" && \
-+test "x$4" != "x$5" && \
- test -d "$4" && \
--ifelse([$5],NONE,,[(test $5 = NONE || test "$4" != "$5") &&]) {
-+ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]) {
- test -n "$verbose" && echo " ... testing for $3-directories under $4"
- test -d $4/$3 && $1="[$]$1 $4/$3"
- test -d $4/$3/$2 && $1="[$]$1 $4/$3/$2"
-@@ -290,75 +334,34 @@
- }
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32
--dnl ----------------
--dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
--dnl in the sharutils 4.2 distribution.
--AC_DEFUN([CF_ANSI_CC_CHECK],
--[
--AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[
--cf_cv_ansi_cc=no
--cf_save_CFLAGS="$CFLAGS"
--cf_save_CPPFLAGS="$CPPFLAGS"
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX -qlanglvl=ansi
--# Ultrix and OSF/1 -std1
--# HP-UX -Aa -D_HPUX_SOURCE
--# SVR4 -Xc
--# UnixWare 1.2 (cannot use -Xc, since ANSI/POSIX clashes)
--for cf_arg in "-DCC_HAS_PROTOS" \
-- "" \
-- -qlanglvl=ansi \
-- -std1 \
-- -Ae \
-- "-Aa -D_HPUX_SOURCE" \
-- -Xc
--do
-- CF_ADD_CFLAGS($cf_arg)
-- AC_TRY_COMPILE(
--[
--#ifndef CC_HAS_PROTOS
--#if !defined(__STDC__) || (__STDC__ != 1)
--choke me
--#endif
--#endif
--],[
-- int test (int i, double x);
-- struct s1 {int (*f) (int a);};
-- struct s2 {int (*f) (double a);};],
-- [cf_cv_ansi_cc="$cf_arg"; break])
--done
--CFLAGS="$cf_save_CFLAGS"
--CPPFLAGS="$cf_save_CPPFLAGS"
--])
--
--if test "$cf_cv_ansi_cc" != "no"; then
--if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then
-- CF_ADD_CFLAGS($cf_cv_ansi_cc)
--else
-- AC_DEFINE(CC_HAS_PROTOS)
--fi
--fi
--])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_ANSI_CC_REQD version: 4 updated: 2008/03/23 14:48:54
--dnl ---------------
--dnl For programs that must use an ANSI compiler, obtain compiler options that
--dnl will make it recognize prototypes. We'll do preprocessor checks in other
--dnl macros, since tools such as unproto can fake prototypes, but only part of
--dnl the preprocessor.
--AC_DEFUN([CF_ANSI_CC_REQD],
--[AC_REQUIRE([CF_ANSI_CC_CHECK])
--if test "$cf_cv_ansi_cc" = "no"; then
-- AC_MSG_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
-- c. use a wrapper such as unproto])
--fi
-+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_AR_FLAGS version: 5 updated: 2010/05/20 20:24:29
- dnl -----------
-@@ -413,7 +416,7 @@
- AC_SUBST(ARFLAGS)
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_BUILD_CC version: 6 updated: 2006/10/14 15:23:15
-+dnl CF_BUILD_CC version: 7 updated: 2012/10/06 15:31:55
- dnl -----------
- dnl If we're cross-compiling, allow the user to override the tools and their
- dnl options. The configure script is oriented toward identifying the host
-@@ -423,7 +426,8 @@
- dnl $1 = default for $CPPFLAGS
- dnl $2 = default for $LIBS
- AC_DEFUN([CF_BUILD_CC],[
--AC_REQUIRE([CF_PROG_EXT])
-+CF_ACVERSION_CHECK(2.52,,
-+ [AC_REQUIRE([CF_PROG_EXT])])
- if test "$cross_compiling" = yes ; then
-
- # defaults that we might want to override
-@@ -504,7 +508,33 @@
- AC_SUBST(BUILD_OBJEXT)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CFG_DEFAULTS version: 7 updated: 2005/09/24 16:15:00
-+dnl CF_CC_ENV_FLAGS version: 1 updated: 2012/10/03 05:25:49
-+dnl ---------------
-+dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
-+dnl into CC. This will not help with broken scripts that wrap the compiler with
-+dnl options, but eliminates a more common category of user confusion.
-+AC_DEFUN([CF_CC_ENV_FLAGS],
-+[
-+# This should have been defined by AC_PROG_CC
-+: ${CC:=cc}
-+
-+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
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_CFG_DEFAULTS version: 10 updated: 2013/09/07 13:54:05
- 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 +552,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*|msys*|k*bsd*-gnu|mingw*)
- prefix=/usr
- ;;
- *) prefix=$ac_default_prefix
-@@ -558,7 +588,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59
-+dnl CF_CHECK_CACHE version: 12 updated: 2012/10/02 20:55:03
- dnl --------------
- dnl Check if we're accidentally using a cache from a different machine.
- dnl Derive the system name, as a check for reusing the autoconf cache.
-@@ -581,7 +611,7 @@
- system_name="`(hostname) 2>/dev/null`"
- fi
- fi
--test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name")
-+test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name",[Define to the system name.])
- AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$system_name"])
-
- test -z "$system_name" && system_name="$cf_cv_system_name"
-@@ -593,7 +623,40 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CURSES_HEADER version: 2 updated: 2010/04/28 06:02:16
-+dnl CF_CLANG_COMPILER version: 2 updated: 2013/11/19 19:23:35
-+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 = CLANG_COMPILER (default)
-+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 +666,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 +690,78 @@
- 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: 12 updated: 2012/10/06 16:30:28
-+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 do not 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_GNAT_PROJECTS version: 1 updated: 2014/06/01 11:34:00
-+dnl ------------------------
-+AC_DEFUN([CF_DISABLE_GNAT_PROJECTS],[
-+AC_MSG_CHECKING(if we want to use GNAT projects)
-+CF_ARG_DISABLE(gnat-projects,
-+ [ --disable-gnat-projects test: disable GNAT projects even if usable],
-+ [enable_gnat_projects=no],
-+ [enable_gnat_projects=yes])
-+AC_MSG_RESULT($enable_gnat_projects)
-+])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,7 +942,26 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32
-+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: 16 updated: 2012/10/02 20:55:03
- dnl -----------------
- dnl Test for availability of useful gcc __attribute__ directives to quiet
- dnl compiler warnings. Though useful, not all are supported -- and contrary
-@@ -885,27 +1039,27 @@
- test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
- cat conftest.h >>confdefs.h
- case $cf_attribute in #(vi
-+ noreturn) #(vi
-+ AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
-+ ;;
- printf) #(vi
-- if test "$cf_printf_attribute" = no ; then
-- cat >>confdefs.h <>confdefs.h <>confdefs.h <>confdefs.h < conftest.$ac_ext </dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
-+])
-+test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
-+AC_SUBST(GNATPREP_OPTS)
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_GNAT_GENERICS version: 2 updated: 2011/03/23 20:24:41
- dnl ----------------
- AC_DEFUN([CF_GNAT_GENERICS],
-@@ -1070,100 +1247,26 @@
- AC_SUBST(cf_generic_objects)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_GNAT_SIGINT version: 1 updated: 2011/03/27 20:07:59
--dnl --------------
--dnl Check if gnat supports SIGINT, and presumably tasking. For the latter, it
--dnl is noted that gnat may compile a tasking unit even for configurations which
--dnl fail at runtime.
--AC_DEFUN([CF_GNAT_SIGINT],[
--AC_CACHE_CHECK(if GNAT supports SIGINT,cf_cv_gnat_sigint,[
--CF_GNAT_TRY_LINK([with Ada.Interrupts.Names;
--
--package ConfTest is
--
-- pragma Warnings (Off); -- the next pragma exists since 3.11p
-- pragma Unreserve_All_Interrupts;
-- pragma Warnings (On);
--
-- protected Process is
-- procedure Stop;
-- function Continue return Boolean;
-- pragma Attach_Handler (Stop, Ada.Interrupts.Names.SIGINT);
-- private
-- Done : Boolean := False;
-- end Process;
--
--end ConfTest;],
--[package body ConfTest is
-- protected body Process is
-- procedure Stop is
-- begin
-- Done := True;
-- end Stop;
-- function Continue return Boolean is
-- begin
-- return not Done;
-- end Continue;
-- end Process;
--end ConfTest;],
-- [cf_cv_gnat_sigint=yes],
-- [cf_cv_gnat_sigint=no])])
--
--if test $cf_cv_gnat_sigint = yes ; then
-- USE_GNAT_SIGINT=""
--else
-- USE_GNAT_SIGINT="#"
--fi
--AC_SUBST(USE_GNAT_SIGINT)
--])dnl
--dnl ---------------------------------------------------------------------------
--dnl CF_GNAT_PRAGMA_UNREF version: 1 updated: 2010/06/19 15:22:18
--dnl --------------------
--dnl Check if the gnat pragma "Unreferenced" works.
--AC_DEFUN([CF_GNAT_PRAGMA_UNREF],[
--AC_CACHE_CHECK(if GNAT pragma Unreferenced works,cf_cv_pragma_unreferenced,[
--CF_GNAT_TRY_LINK([procedure conftest;],
--[with Text_IO;
--with GNAT.OS_Lib;
--procedure conftest is
-- test : Integer;
-- pragma Unreferenced (test);
--begin
-- test := 1;
-- Text_IO.Put ("Hello World");
-- Text_IO.New_Line;
-- GNAT.OS_Lib.OS_Exit (0);
--end conftest;],
-- [cf_cv_pragma_unreferenced=yes],
-- [cf_cv_pragma_unreferenced=no])])
--
--# if the pragma is supported, use it (needed in the Trace code).
--if test $cf_cv_pragma_unreferenced = yes ; then
-- PRAGMA_UNREF=TRUE
--else
-- PRAGMA_UNREF=FALSE
--fi
--AC_SUBST(PRAGMA_UNREF)
--])dnl
--dnl ---------------------------------------------------------------------------
--dnl CF_GNAT_PROJECTS version: 2 updated: 2011/03/23 20:24:41
-+dnl CF_GNAT_PROJECTS version: 7 updated: 2014/06/01 10:46:34
- dnl ----------------
- dnl GNAT projects are configured with ".gpr" project files.
- dnl GNAT libraries are a further development, using the project feature.
- AC_DEFUN([CF_GNAT_PROJECTS],
- [
- AC_REQUIRE([CF_GNAT_VERSION])
-+AC_REQUIRE([CF_DISABLE_GNAT_PROJECTS])
-
- cf_gnat_libraries=no
- cf_gnat_projects=no
-
-+if test "$enable_gnat_projects" != no ; then
- AC_MSG_CHECKING(if GNAT supports project files)
- case $cf_gnat_version in #(vi
- 3.[[0-9]]*) #(vi
- ;;
- *)
- case $cf_cv_system_name in #(vi
-- cygwin*) #(vi
-+ cygwin*|msys*) #(vi
- ;;
- *)
- mkdir conftest.src conftest.bin conftest.lib
-@@ -1180,14 +1283,6 @@
- for Library_Dir use External("BUILD_DIR");
- Source_Dir := External ("SOURCE_DIR");
- for Source_Dirs use (Source_Dir);
-- package Compiler is
-- for Default_Switches ("Ada") use
-- ("-g",
-- "-O2",
-- "-gnatafno",
-- "-gnatVa", -- All validity checks
-- "-gnatwa"); -- Activate all optional errors
-- end Compiler;
- end Library;
- CF_EOF
- cat >>confpackage.ads <conftest.$ac_ext </dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep lib$3.`
-- test -z "$cf_cv_$3_soname" && cf_cv_$3_soname=unknown
-- fi
-- fi
--rm -rf conftest*
--LIBS="$cf_save_LIBS"
--fi
--])
--])
--dnl ---------------------------------------------------------------------------
--dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03
-+dnl CF_LIB_SUFFIX version: 23 updated: 2014/06/21 17:47:12
- dnl -------------
- dnl Compute the library file-suffix from the given model name
- dnl $1 = model name
-@@ -1664,31 +1762,26 @@
- dnl The variable $LIB_SUFFIX, if set, prepends the variable to set.
- AC_DEFUN([CF_LIB_SUFFIX],
- [
-- AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
-- case $1 in #(vi
-- libtool) #(vi
-+ case X$1 in #(vi
-+ Xlibtool) #(vi
- $2='.la'
- $3=[$]$2
- ;;
-- normal) #(vi
-- $2='.a'
-- $3=[$]$2
-- ;;
-- debug) #(vi
-+ Xdebug) #(vi
- $2='_g.a'
- $3=[$]$2
- ;;
-- profile) #(vi
-+ Xprofile) #(vi
- $2='_p.a'
- $3=[$]$2
- ;;
-- shared) #(vi
-+ Xshared) #(vi
- case $cf_cv_system_name in
-- aix[[56]]*) #(vi
-- $2='.a'
-+ aix[[5-7]]*) #(vi
-+ $2='.so'
- $3=[$]$2
- ;;
-- cygwin*) #(vi
-+ cygwin*|msys*|mingw*) #(vi
- $2='.dll'
- $3='.dll.a'
- ;;
-@@ -1708,10 +1801,16 @@
- ;;
- esac
- ;;
-- *) $2='.so'
-+ *) #(vi
-+ $2='.so'
- $3=[$]$2
- ;;
- esac
-+ ;;
-+ *)
-+ $2='.a'
-+ $3=[$]$2
-+ ;;
- esac
- test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
- test -n "$LIB_SUFFIX" && $3="${LIB_SUFFIX}[$]{$3}"
-@@ -1735,7 +1834,7 @@
- test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LINK_DATAONLY version: 9 updated: 2009/01/01 20:21:38
-+dnl CF_LINK_DATAONLY version: 10 updated: 2012/10/06 17:41:51
- dnl ----------------
- dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
- dnl only data (i.e., no functions), for example NeXT. On those systems we'll
-@@ -1792,82 +1891,13 @@
- AC_MSG_RESULT($cf_cv_link_dataonly)
-
- if test "$cf_cv_link_dataonly" = no ; then
-- AC_DEFINE(BROKEN_LINKER)
-+ AC_DEFINE(BROKEN_LINKER,1,[if data-only library module does not link])
- BROKEN_LINKER=1
- fi
-
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LINK_FUNCS version: 7 updated: 2006/12/16 12:33:30
--dnl -------------
--dnl Most Unix systems have both link and symlink, a few don't have symlink.
--dnl A few non-Unix systems implement symlink, but not link.
--dnl A few non-systems implement neither (or have nonfunctional versions).
--AC_DEFUN([CF_LINK_FUNCS],
--[
--AC_CHECK_FUNCS( \
-- remove \
-- unlink )
--
--if test "$cross_compiling" = yes ; then
-- AC_CHECK_FUNCS( \
-- link \
-- symlink )
--else
-- AC_CACHE_CHECK(if link/symlink functions work,cf_cv_link_funcs,[
-- cf_cv_link_funcs=
-- for cf_func in link symlink ; do
-- AC_TRY_RUN([
--#include
--#include
--#ifdef HAVE_UNISTD_H
--#include
--#endif
--int main()
--{
-- int fail = 0;
-- char *src = "config.log";
-- char *dst = "conftest.chk";
-- struct stat src_sb;
-- struct stat dst_sb;
--
-- stat(src, &src_sb);
-- fail = ($cf_func("config.log", "conftest.chk") < 0)
-- || (stat(dst, &dst_sb) < 0)
-- || (dst_sb.st_mtime != src_sb.st_mtime);
--#ifdef HAVE_UNLINK
-- unlink(dst);
--#else
-- remove(dst);
--#endif
-- ${cf_cv_main_return:-return} (fail);
--}
-- ],[
-- cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
-- eval 'ac_cv_func_'$cf_func'=yes'],[
-- eval 'ac_cv_func_'$cf_func'=no'],[
-- eval 'ac_cv_func_'$cf_func'=error'])
-- done
-- test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
-- ])
-- test "$ac_cv_func_link" = yes && AC_DEFINE(HAVE_LINK)
-- test "$ac_cv_func_symlink" = yes && AC_DEFINE(HAVE_SYMLINK)
--fi
--])dnl
--dnl ---------------------------------------------------------------------------
--dnl CF_MAIN_RETURN version: 1 updated: 2006/12/10 09:51:54
--dnl --------------
--dnl Check if a return from main to the shell actually returns the same exit
--dnl code. This is true for almost any POSIX environment.
--dnl
--dnl Some very old environments did not flush stdout, etc., on an exit. That
--dnl would be a useful case to test for also.
--AC_DEFUN([CF_MAIN_RETURN],
--[
--cf_cv_main_return=return
--])dnl
--dnl ---------------------------------------------------------------------------
--dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46
-+dnl CF_MAKEFLAGS version: 15 updated: 2014/05/10 16:43:23
- dnl ------------
- dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
- dnl options to lower-levels. It's very useful for "make -n" -- if we have it.
-@@ -1886,7 +1916,7 @@
- CF_EOF
- cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[ ]]*$,,'`
- case "$cf_result" in
-- .*k)
-+ .*k|.*kw)
- cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
- case "$cf_result" in
- .*CC=*) cf_cv_makeflags=
-@@ -1944,7 +1974,7 @@
- AC_SUBST(MAKE_LOWER_TAGS)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_MIXEDCASE_FILENAMES version: 3 updated: 2003/09/20 17:07:55
-+dnl CF_MIXEDCASE_FILENAMES version: 6 updated: 2013/10/08 17:47:05
- dnl ----------------------
- dnl Check if the file-system supports mixed-case filenames. If we're able to
- dnl create a lowercase name and see it as uppercase, it doesn't support that.
-@@ -1953,7 +1983,7 @@
- AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
- if test "$cross_compiling" = yes ; then
- case $target_alias in #(vi
-- *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi
-+ *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) #(vi
- cf_cv_mixedcase=no
- ;;
- *)
-@@ -1971,10 +2001,10 @@
- rm -f conftest CONFTEST
- fi
- ])
--test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
-+test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37
-+dnl CF_MKSTEMP version: 9 updated: 2012/10/03 04:34:49
- 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).
-@@ -2016,11 +2046,13 @@
- }
- ],[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)
-+ AC_DEFINE(HAVE_MKSTEMP,1,[Define to 1 if mkstemp() is available and working.])
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-@@ -2141,7 +2173,7 @@
- ,[$1=no])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_NCURSES_CONFIG version: 8 updated: 2010/07/08 05:17:30
-+dnl CF_NCURSES_CONFIG version: 10 updated: 2012/10/06 08:57:51
- dnl -----------------
- dnl Tie together the configure-script macros for ncurses.
- dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis.
-@@ -2153,7 +2185,10 @@
- cf_ncuconfig_root=ifelse($1,,ncurses,$1)
-
- echo "Looking for ${cf_ncuconfig_root}-config"
--AC_PATH_PROGS(NCURSES_CONFIG,${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config,none)
-+
-+CF_ACVERSION_CHECK(2.52,
-+ [AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)],
-+ [AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)])
-
- if test "$NCURSES_CONFIG" != none ; then
-
-@@ -2164,7 +2199,7 @@
- CF_CURSES_HEADER(ifelse($1,,ncurses,$1))
-
- dnl like CF_NCURSES_CPPFLAGS
--AC_DEFINE(NCURSES)
-+AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
-
- dnl like CF_NCURSES_LIBS
- CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncuconfig_root)
-@@ -2181,7 +2216,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_NCURSES_CPPFLAGS version: 20 updated: 2010/11/20 17:02:38
-+dnl CF_NCURSES_CPPFLAGS version: 21 updated: 2012/10/06 08:57:51
- dnl -------------------
- dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
- dnl the CPPFLAGS variable so we can include its header.
-@@ -2227,12 +2262,12 @@
- CF_TERM_HEADER
-
- # some applications need this, but should check for NCURSES_VERSION
--AC_DEFINE(NCURSES)
-+AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
-
- CF_NCURSES_VERSION
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_NCURSES_HEADER version: 2 updated: 2008/03/23 14:48:54
-+dnl CF_NCURSES_HEADER version: 3 updated: 2012/10/06 08:57:51
- dnl -----------------
- dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
- dnl variations of ncurses' installs.
-@@ -2283,16 +2318,16 @@
-
- case $cf_cv_ncurses_header in # (vi
- *ncurses.h)
-- AC_DEFINE(HAVE_NCURSES_H)
-+ AC_DEFINE(HAVE_NCURSES_H,1,[Define to 1 if we have ncurses.h])
- ;;
- esac
-
- case $cf_cv_ncurses_header in # (vi
- ncurses/curses.h|ncurses/ncurses.h)
-- AC_DEFINE(HAVE_NCURSES_NCURSES_H)
-+ AC_DEFINE(HAVE_NCURSES_NCURSES_H,1,[Define to 1 if we have ncurses/ncurses.h])
- ;;
- ncursesw/curses.h|ncursesw/ncurses.h)
-- AC_DEFINE(HAVE_NCURSESW_NCURSES_H)
-+ AC_DEFINE(HAVE_NCURSESW_NCURSES_H,1,[Define to 1 if we have ncursesw/ncurses.h])
- ;;
- esac
-
-@@ -2366,7 +2401,7 @@
- AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_NCURSES_VERSION version: 13 updated: 2010/10/23 15:54:49
-+dnl CF_NCURSES_VERSION version: 14 updated: 2012/10/06 08:57:51
- dnl ------------------
- dnl Check for the version of ncurses, to aid in reporting bugs, etc.
- dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS. We don't use
-@@ -2425,58 +2460,10 @@
- ])
- rm -f $cf_tempfile
- ])
--test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES)
--])dnl
--dnl ---------------------------------------------------------------------------
--dnl CF_NO_LEAKS_OPTION version: 4 updated: 2006/12/16 14:24:05
--dnl ------------------
--dnl see CF_WITH_NO_LEAKS
--AC_DEFUN([CF_NO_LEAKS_OPTION],[
--AC_MSG_CHECKING(if you want to use $1 for testing)
--AC_ARG_WITH($1,
-- [$2],
-- [AC_DEFINE($3)ifelse([$4],,[
-- $4
--])
-- : ${with_cflags:=-g}
-- : ${with_no_leaks:=yes}
-- with_$1=yes],
-- [with_$1=])
--AC_MSG_RESULT(${with_$1:-no})
--
--case .$with_cflags in #(vi
--.*-g*)
-- case .$CFLAGS in #(vi
-- .*-g*) #(vi
-- ;;
-- *)
-- CF_ADD_CFLAGS([-g])
-- ;;
-- esac
-- ;;
--esac
--])dnl
--dnl ---------------------------------------------------------------------------
--dnl CF_NUMBER_SYNTAX version: 1 updated: 2003/09/20 18:12:49
--dnl ----------------
--dnl Check if the given variable is a number. If not, report an error.
--dnl $1 is the variable
--dnl $2 is the message
--AC_DEFUN([CF_NUMBER_SYNTAX],[
--if test -n "$1" ; then
-- case $1 in #(vi
-- [[0-9]]*) #(vi
-- ;;
-- *)
-- AC_MSG_ERROR($2 is not a number: $1)
-- ;;
-- esac
--else
-- AC_MSG_ERROR($2 value is empty)
--fi
-+test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_OBJ_SUBDIR version: 4 updated: 2002/02/23 20:38:31
-+dnl CF_OBJ_SUBDIR version: 6 updated: 2013/09/07 14:06:10
- dnl -------------
- dnl Compute the object-directory name from the given model name
- AC_DEFUN([CF_OBJ_SUBDIR],
-@@ -2488,7 +2475,7 @@
- profile) $2='obj_p' ;;
- shared)
- case $cf_cv_system_name in #(vi
-- cygwin) #(vi
-+ cygwin|msys) #(vi
- $2='objects' ;;
- *)
- $2='obj_s' ;;
-@@ -2496,20 +2483,23 @@
- esac
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_PATHSEP version: 5 updated: 2010/05/26 05:38:42
-+dnl CF_PATHSEP version: 6 updated: 2012/09/29 18:38:12
- dnl ----------
--dnl Provide a value for the $PATH and similar separator
-+dnl Provide a value for the $PATH and similar separator (or amend the value
-+dnl as provided in autoconf 2.5x).
- AC_DEFUN([CF_PATHSEP],
- [
-+ AC_MSG_CHECKING(for PATH separator)
- case $cf_cv_system_name in
- os2*) PATH_SEPARATOR=';' ;;
-- *) PATH_SEPARATOR=':' ;;
-+ *) ${PATH_SEPARATOR:=':'} ;;
- esac
- ifelse([$1],,,[$1=$PATH_SEPARATOR])
- AC_SUBST(PATH_SEPARATOR)
-+ AC_MSG_RESULT($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
-@@ -2529,7 +2519,7 @@
- ;;
- .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX
- ;;
--.\[$]{*prefix}*) #(vi
-+.\[$]{*prefix}*|.\[$]{*dir}*) #(vi
- eval $1="[$]$1"
- case ".[$]$1" in #(vi
- .NONE/*)
-@@ -2546,7 +2536,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],
-@@ -2563,7 +2553,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
-@@ -2667,6 +2659,19 @@
- test -z "$AWK" && AC_MSG_ERROR(No awk program found)
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_PROG_CC version: 4 updated: 2014/07/12 18:57:58
-+dnl ----------
-+dnl standard check for CC, plus followup sanity checks
-+dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
-+AC_DEFUN([CF_PROG_CC],[
-+ifelse($1,,[AC_PROG_CC],[AC_PROG_CC($1)])
-+CF_GCC_VERSION
-+CF_ACVERSION_CHECK(2.52,
-+ [AC_PROG_CC_STDC],
-+ [CF_ANSI_CC_REQD])
-+CF_CC_ENV_FLAGS
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_PROG_CC_C_O version: 3 updated: 2010/08/14 18:25:37
- dnl --------------
- dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that
-@@ -2721,7 +2726,7 @@
- test -z "$EGREP" && AC_MSG_ERROR(No egrep program found)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_PROG_EXT version: 10 updated: 2004/01/03 19:28:18
-+dnl CF_PROG_EXT version: 11 updated: 2012/10/06 08:57:51
- dnl -----------
- dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX.
- AC_DEFUN([CF_PROG_EXT],
-@@ -2743,10 +2748,10 @@
-
- PROG_EXT="$EXEEXT"
- AC_SUBST(PROG_EXT)
--test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
-+test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the program extension (normally blank)])
- ])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],[
-@@ -2754,6 +2759,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)
-@@ -2831,18 +2837,19 @@
- $1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'`
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_SHARED_OPTS version: 64 updated: 2010/06/05 16:51:16
-+dnl CF_SHARED_OPTS version: 84 updated: 2013/11/03 06:26:10
- dnl --------------
- dnl --------------
- dnl Attempt to determine the appropriate CC/LD options for creating a shared
- dnl library.
- dnl
--dnl Note: ${LOCAL_LDFLAGS} is used to link executables that will run within the
--dnl build-tree, i.e., by making use of the libraries that are compiled in ../lib
--dnl We avoid compiling-in a ../lib path for the shared library since that can
--dnl lead to unexpected results at runtime.
--dnl ${LOCAL_LDFLAGS2} has the same intention but assumes that the shared libraries
--dnl are compiled in ../../lib
-+dnl Notes:
-+dnl a) ${LOCAL_LDFLAGS} is used to link executables that will run within
-+dnl the build-tree, i.e., by making use of the libraries that are compiled in
-+dnl $rel_builddir/lib We avoid compiling-in a $rel_builddir/lib path for the
-+dnl shared library since that can lead to unexpected results at runtime.
-+dnl b) ${LOCAL_LDFLAGS2} has the same intention but assumes that the shared
-+dnl libraries are compiled in ../../lib
- dnl
- dnl The variable 'cf_cv_do_symlinks' is used to control whether we configure
- dnl to install symbolic links to the rel/abi versions of shared libraries.
-@@ -2857,12 +2864,19 @@
- dnl Some loaders leave 'so_locations' lying around. It's nice to clean up.
- AC_DEFUN([CF_SHARED_OPTS],
- [
-- AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
- AC_REQUIRE([CF_LD_RPATH_OPT])
-+ RM_SHARED_OPTS=
- LOCAL_LDFLAGS=
- LOCAL_LDFLAGS2=
- LD_SHARED_OPTS=
- INSTALL_LIB="-m 644"
-+ : ${rel_builddir:=.}
-+
-+ shlibdir=$libdir
-+ AC_SUBST(shlibdir)
-+
-+ MAKE_DLLS="#"
-+ AC_SUBST(MAKE_DLLS)
-
- cf_cv_do_symlinks=no
- cf_ld_rpath_opt=
-@@ -2887,6 +2901,7 @@
- AC_MSG_RESULT($cf_cv_shlib_version)
-
- cf_cv_rm_so_locs=no
-+ cf_try_cflags=
-
- # Some less-capable ports of gcc support only -fpic
- CC_SHARED_OPTS=
-@@ -2906,10 +2921,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
-@@ -2917,9 +2936,12 @@
- ;;
- cygwin*) #(vi
- CC_SHARED_OPTS=
-- MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
-+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
-+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
- cf_cv_shlib_version=cygdll
- cf_cv_shlib_version_infix=cygdll
-+ shlibdir=$bindir
-+ MAKE_DLLS=
- cat >mk_shared_lib.sh <<-CF_EOF
- #!/bin/sh
- SHARED_LIB=\[$]1
-@@ -2930,12 +2952,34 @@
- ** 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}
-+ exec \[$]* -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
-+CF_EOF
-+ chmod +x mk_shared_lib.sh
-+ ;;
-+ msys*) #(vi
-+ CC_SHARED_OPTS=
-+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
-+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
-+ cf_cv_shlib_version=msysdll
-+ cf_cv_shlib_version_infix=msysdll
-+ shlibdir=$bindir
-+ MAKE_DLLS=
-+ cat >mk_shared_lib.sh <<-CF_EOF
-+ #!/bin/sh
-+ SHARED_LIB=\[$]1
-+ IMPORT_LIB=\`echo "\[$]1" | sed -e 's/msys-/lib/' -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=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
- CF_EOF
- chmod +x mk_shared_lib.sh
- ;;
- darwin*) #(vi
-- EXTRA_CFLAGS="-no-cpp-precomp"
-+ cf_try_cflags="no-cpp-precomp"
- CC_SHARED_OPTS="-dynamic"
- 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
-@@ -2949,6 +2993,14 @@
- LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- fi
- ;;
-+ hpux[[7-8]]*) #(vi
-+ # HP-UX 8.07 ld lacks "+b" option used for libdir search-list
-+ if test "$GCC" != yes; then
-+ CC_SHARED_OPTS='+Z'
-+ fi
-+ MK_SHARED_LIB='${LD} -b -o $[@]'
-+ INSTALL_LIB="-m 555"
-+ ;;
- hpux*) #(vi
- # (tested with gcc 2.7.2 -- I don't have c89)
- if test "$GCC" = yes; then
-@@ -2962,9 +3014,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
-@@ -2981,18 +3043,45 @@
- 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
-+ shlibdir=$bindir
-+ MAKE_DLLS=
-+ if test "$DFT_LWR_MODEL" = "shared" ; then
-+ LOCAL_LDFLAGS="-Wl,--enable-auto-import"
-+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
-+ EXTRA_LDFLAGS="-Wl,--enable-auto-import $EXTRA_LDFLAGS"
-+ fi
-+ CC_SHARED_OPTS=
-+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
-+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
-+ 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,--enable-auto-import,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{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 +3092,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 +3107,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
-@@ -3029,7 +3118,7 @@
- CF_SHARED_SONAME
- MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
- else
-- MK_SHARED_LIB='${LD} -shared -Bshareable -o $[@]'
-+ MK_SHARED_LIB='${CC} -Wl,-shared -Wl,-Bshareable -o $[@]'
- fi
- ;;
- osf*|mls+*) #(vi
-@@ -3123,20 +3212,57 @@
- ;;
- esac
-
-- if test -n "$cf_ld_rpath_opt" ; then
-- MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
-+ if test -n "$cf_try_cflags"
-+ then
-+cat > conftest.$ac_ext <
-+int main(int argc, char *argv[[]])
-+{
-+ printf("hello\n");
-+ return (argv[[argc-1]] == 0) ;
-+}
-+EOF
-+ cf_save_CFLAGS="$CFLAGS"
-+ for cf_opt in $cf_try_cflags
-+ do
-+ CFLAGS="$cf_save_CFLAGS -$cf_opt"
-+ AC_MSG_CHECKING(if CFLAGS option -$cf_opt works)
-+ if AC_TRY_EVAL(ac_compile); then
-+ AC_MSG_RESULT(yes)
-+ cf_save_CFLAGS="$CFLAGS"
-+ else
-+ AC_MSG_RESULT(no)
-+ fi
-+ done
-+ CFLAGS="$cf_save_CFLAGS"
- 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 $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations"
-+
-+ 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)
- AC_SUBST(LD_SHARED_OPTS)
- AC_SUBST(MK_SHARED_LIB)
-+ AC_SUBST(RM_SHARED_OPTS)
-+
- AC_SUBST(LINK_PROGS)
- AC_SUBST(LINK_TESTS)
-+
- AC_SUBST(EXTRA_LDFLAGS)
- 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
-@@ -3163,7 +3289,7 @@
- AC_DEFUN([CF_STRIP_G_OPT],
- [$1=`echo ${$1} | sed -e 's%-g %%' -e 's%-g$%%'`])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_SUBDIR_PATH version: 6 updated: 2010/04/21 06:20:50
-+dnl CF_SUBDIR_PATH version: 7 updated: 2014/12/04 04:33:06
- dnl --------------
- dnl Construct a search-list for a nonstandard header/lib-file
- dnl $1 = the variable to return as result
-@@ -3173,31 +3299,21 @@
- [
- $1=
-
--CF_ADD_SUBDIR_PATH($1,$2,$3,/usr,$prefix)
- CF_ADD_SUBDIR_PATH($1,$2,$3,$prefix,NONE)
--CF_ADD_SUBDIR_PATH($1,$2,$3,/usr/local,$prefix)
--CF_ADD_SUBDIR_PATH($1,$2,$3,/opt,$prefix)
--CF_ADD_SUBDIR_PATH($1,$2,$3,[$]HOME,$prefix)
--])dnl
--dnl ---------------------------------------------------------------------------
--dnl CF_SUBST version: 4 updated: 2006/06/17 12:33:03
--dnl --------
--dnl Shorthand macro for substituting things that the user may override
--dnl with an environment variable.
--dnl
--dnl $1 = long/descriptive name
--dnl $2 = environment variable
--dnl $3 = default value
--AC_DEFUN([CF_SUBST],
--[AC_CACHE_VAL(cf_cv_subst_$2,[
--AC_MSG_CHECKING(for $1 (symbol $2))
--CF_SUBST_IF([-z "[$]$2"], [$2], [$3])
--cf_cv_subst_$2=[$]$2
--AC_MSG_RESULT([$]$2)
--])
-+
-+for cf_subdir_prefix in \
-+ /usr \
-+ /usr/local \
-+ /usr/pkg \
-+ /opt \
-+ /opt/local \
-+ [$]HOME
-+do
-+ CF_ADD_SUBDIR_PATH($1,$2,$3,$cf_subdir_prefix,$prefix)
-+done
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_TERM_HEADER version: 2 updated: 2010/10/23 15:54:49
-+dnl CF_TERM_HEADER version: 3 updated: 2012/10/06 08:57:51
- dnl --------------
- dnl Look for term.h, which is part of X/Open curses. It defines the interface
- dnl to terminfo database. Usually it is in the same include-path as curses.h,
-@@ -3230,29 +3346,68 @@
-
- case $cf_cv_term_header in # (vi
- *term.h)
-- AC_DEFINE(HAVE_TERM_H)
-+ AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h])
- ;;
- esac
-
- case $cf_cv_term_header in # (vi
- ncurses/term.h) #(vi
-- AC_DEFINE(HAVE_NCURSES_TERM_H)
-+ AC_DEFINE(HAVE_NCURSES_TERM_H,1,[Define to 1 if we have ncurses/term.h])
- ;;
- ncursesw/term.h)
-- AC_DEFINE(HAVE_NCURSESW_TERM_H)
-+ AC_DEFINE(HAVE_NCURSESW_TERM_H,1,[Define to 1 if we have ncursesw/term.h])
- ;;
- esac
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_TOP_BUILDDIR version: 1 updated: 2006/10/15 16:33:23
-+dnl CF_TOP_BUILDDIR version: 2 updated: 2013/07/27 17:38:32
- dnl ---------------
- dnl Define a top_builddir symbol, for applications that need an absolute path.
- AC_DEFUN([CF_TOP_BUILDDIR],
- [
--top_builddir=`pwd`
-+top_builddir=ifelse($1,,`pwd`,$1)
- 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
-@@ -3262,7 +3417,7 @@
- $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_UTF8_LIB version: 7 updated: 2010/06/20 09:24:28
-+dnl CF_UTF8_LIB version: 8 updated: 2012/10/06 08:57:51
- dnl -----------
- dnl Check for multibyte support, and if not found, utf8 compatibility library
- AC_DEFUN([CF_UTF8_LIB],
-@@ -3281,7 +3436,7 @@
- # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
- # ncurses/ncursesw:
- if test "$cf_cv_utf8_lib" = "add-on" ; then
-- AC_DEFINE(HAVE_LIBUTF8_H)
-+ AC_DEFINE(HAVE_LIBUTF8_H,1,[Define to 1 if we should include libutf8.h])
- CF_ADD_INCDIR($cf_cv_header_path_utf8)
- CF_ADD_LIBDIR($cf_cv_library_path_utf8)
- CF_ADD_LIBS($cf_cv_library_file_utf8)
-@@ -3363,14 +3518,14 @@
- AC_MSG_RESULT($ADA_OBJECTS)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_ADA_SHAREDLIB version: 2 updated: 2010/06/26 17:35:58
-+dnl CF_WITH_ADA_SHAREDLIB version: 4 updated: 2014/05/31 21:08:37
- dnl ---------------------
- dnl Command-line option to specify if an Ada95 shared-library should be built,
- dnl and optionally what its soname should be.
- AC_DEFUN([CF_WITH_ADA_SHAREDLIB],[
- AC_MSG_CHECKING(if an Ada95 shared-library should be built)
- AC_ARG_WITH(ada-sharedlib,
-- [ --with-ada-sharedlib=XX build Ada95 shared-library],
-+ [ --with-ada-sharedlib=soname build shared-library (requires GNAT projects)],
- [with_ada_sharedlib=$withval],
- [with_ada_sharedlib=no])
- AC_MSG_RESULT($with_ada_sharedlib)
-@@ -3415,7 +3570,33 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_PATH version: 10 updated: 2010/10/23 15:44:18
-+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: 11 updated: 2012/09/29 15:04:19
- dnl ------------
- dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
- dnl defaulting to yes/no.
-@@ -3432,11 +3613,54 @@
- if ifelse([$5],,true,[test -n "$5"]) ; then
- CF_PATH_SYNTAX(withval)
- fi
--$3="$withval"
-+eval $3="$withval"
- 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: 6 updated: 2012/10/06 17:41:51
- dnl ---------------
- dnl Check for POSIX thread library.
- AC_DEFUN([CF_WITH_PTHREAD],
-@@ -3450,30 +3674,55 @@
-
- if test "$with_pthread" != no ; then
- AC_CHECK_HEADER(pthread.h,[
-- AC_DEFINE(HAVE_PTHREADS_H)
-+ AC_DEFINE(HAVE_PTHREADS_H,1,[Define to 1 if we have pthreads.h header])
-
-- 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,1,[Define to 1 if we have pthreads library])
-+ 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_WITH_SYSTYPE version: 1 updated: 2013/01/26 16:26:12
-+dnl ---------------
-+dnl For testing, override the derived host system-type which is used to decide
-+dnl things such as the linker commands used to build shared libraries. This is
-+dnl normally chosen automatically based on the type of system which you are
-+dnl building on. We use it for testing the configure script.
-+dnl
-+dnl This is different from the --host option: it is used only for testing parts
-+dnl of the configure script which would not be reachable with --host since that
-+dnl relies on the build environment being real, rather than mocked up.
-+AC_DEFUN([CF_WITH_SYSTYPE],[
-+CF_CHECK_CACHE([AC_CANONICAL_SYSTEM])
-+AC_ARG_WITH(system-type,
-+ [ --with-system-type=XXX test: override derived host system-type],
-+[AC_MSG_WARN(overriding system type to $withval)
-+ cf_cv_system_name=$withval
-+ host_os=$withval
-+])
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_XOPEN_SOURCE version: 48 updated: 2014/09/01 12:29:14
- 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,
-@@ -3483,16 +3732,17 @@
- dnl $1 is the nominal value for _XOPEN_SOURCE
- dnl $2 is the nominal value for _POSIX_C_SOURCE
- AC_DEFUN([CF_XOPEN_SOURCE],[
-+AC_REQUIRE([AC_CANONICAL_HOST])
-
- cf_XOPEN_SOURCE=ifelse([$1],,500,[$1])
- cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2])
- cf_xopen_source=
-
- case $host_os in #(vi
--aix[[456]]*) #(vi
-+aix[[4-7]]*) #(vi
- cf_xopen_source="-D_ALL_SOURCE"
- ;;
--cygwin) #(vi
-+cygwin|msys) #(vi
- cf_XOPEN_SOURCE=600
- ;;
- darwin[[0-8]].*) #(vi
-@@ -3500,6 +3750,7 @@
- ;;
- darwin*) #(vi
- cf_xopen_source="-D_DARWIN_C_SOURCE"
-+ cf_XOPEN_SOURCE=
- ;;
- freebsd*|dragonfly*) #(vi
- # 5.x headers associate
-@@ -3517,15 +3768,26 @@
- ;;
- irix[[56]].*) #(vi
- cf_xopen_source="-D_SGI_SOURCE"
-+ cf_XOPEN_SOURCE=
- ;;
- linux*|gnu*|mint*|k*bsd*-gnu) #(vi
- CF_GNU_SOURCE
- ;;
-+minix*) #(vi
-+ cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
-+ ;;
- 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,41 +3801,50 @@
- 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__"
-+ cf_cv_xopen_source=broken
-+ ;;
-+sysv4.2uw2.*) # Novell/SCO UnixWare 2.x (tested on 2.1.2)
-+ cf_XOPEN_SOURCE=
-+ cf_POSIX_C_SOURCE=
- ;;
- *)
-- AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
-- AC_TRY_COMPILE([#include ],[
-+ CF_TRY_XOPEN_SOURCE
-+ CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
-+ ;;
-+esac
-+
-+if test -n "$cf_xopen_source" ; then
-+ CF_ADD_CFLAGS($cf_xopen_source,true)
-+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_cv_xopen_source=no],
-- [cf_save="$CPPFLAGS"
-- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
-- AC_TRY_COMPILE([#include ],[
--#ifdef _XOPEN_SOURCE
-+ [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_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)
-+ [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
-- CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
-- ;;
--esac
--
--if test -n "$cf_xopen_source" ; then
-- CF_ADD_CFLAGS($cf_xopen_source)
- fi
- ])
-Index: Ada95/configure
---- ncurses-5.9/Ada95/configure 2011-03-31 23:34:47.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/configure 2014-12-06 13:38:40.000000000 +0000
-@@ -1,7 +1,7 @@
- #! /bin/sh
--# From configure.in Revision: 1.30 .
-+# From configure.in Revision: 1.56 .
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by Autoconf 2.52.20101002.
-+# Generated by Autoconf 2.52.20141204.
- #
- # 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,7 +654,7 @@
-
- --with-system-type=XXX test: override derived host system-type
- --with-pkg-config{=path} enable/disable use of pkg-config
-- --enable-pc-files generate and install .pc files for pkg-config
-+ --with-pkg-config-libdir=XXX use given directory for installing pc-files
- --without-tests suppress build with test-programs
- --enable-mixed-case tic should assume mixed-case filenames
- --with-install-prefix prefixes actual install-location ($DESTDIR)
-@@ -660,6 +669,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,17 +687,18 @@
- --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 do not 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
- --disable-macros test: use functions rather than macros
- --with-trace test: add trace() function to all models of ncurses
-+ --disable-gnat-projects test: disable GNAT projects even if usable
- Ada95 Binding Options:
- --with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake)
- --with-ada-include=DIR Ada includes are in DIR (default: PREFIX/share/ada/adainclude)
- --with-ada-objects=DIR Ada objects are in DIR (default: PREFIX/lib/ada/adalib)
-- --with-ada-sharedlib=XX build Ada95 shared-library
-+ --with-ada-sharedlib=soname build shared-library (requires GNAT projects)
-
- Some influential environment variables:
- CC C compiler command
-@@ -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.20141204. 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
-@@ -963,19 +974,19 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
-
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-- *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T=' ' ;;
-+case `echo "testing\c" 2>/dev/null; echo 1,2,3`,`echo -n testing 2>/dev/null; echo 1,2,3` in
-+ *c*,-n*) ECHO_N= ECHO_C= # newlines do not sed ;-) only broken shells would use this case anyway
-+ ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
- esac
- 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/'`
-@@ -1100,7 +1111,8 @@
- system_name="`(hostname) 2>/dev/null`"
- fi
- fi
--test -n "$system_name" && cat >>confdefs.h <>confdefs.h <&5
-+test -n "$cf_cv_system_name" && echo "$as_me:1126: 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:1130: 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:1132: 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,9 +1137,11 @@
- # 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:1140: WARNING: overriding system type to $withval" >&5
- echo "$as_me: WARNING: overriding system type to $withval" >&2;}
-- cf_cv_system_name=$withval
-+ cf_cv_system_name=$withval
-+ host_os=$withval
-+
- fi;
-
- ### Save the given $CFLAGS to allow user-override.
-@@ -1135,23 +1149,23 @@
-
- ### Default install-location
-
--echo "$as_me:1138: checking for prefix" >&5
-+echo "$as_me:1152: 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*|msys*|k*bsd*-gnu|mingw*)
- prefix=/usr
- ;;
- *) prefix=$ac_default_prefix
- ;;
- esac
- fi
--echo "$as_me:1150: result: $prefix" >&5
-+echo "$as_me:1164: 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:1168: 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,11 +1188,12 @@
- fi
- test -n "$verbose" && echo " tested $cf_dir" 1>&6
- done
--echo "$as_me:1177: result: $includedir" >&5
-+echo "$as_me:1191: result: $includedir" >&5
- echo "${ECHO_T}$includedir" >&6
- fi
-
- ### Checks for programs.
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -1186,213 +1201,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:1208: 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 +1220,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:1223: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -1415,10 +1228,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:1418: result: $CC" >&5
-+ echo "$as_me:1231: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
-- echo "$as_me:1421: result: no" >&5
-+ echo "$as_me:1234: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -1427,11 +1240,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:1247: 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 +1259,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:1262: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -1454,10 +1267,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:1270: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
-- echo "$as_me:1460: result: no" >&5
-+ echo "$as_me:1273: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -1467,34 +1280,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:1283: 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:1288:" \
- "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:1291: \"$ac_compiler --version &5\"") >&5
- (eval $ac_compiler --version &5) 2>&5
- ac_status=$?
-- echo "$as_me:1483: \$? = $ac_status" >&5
-+ echo "$as_me:1294: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:1485: \"$ac_compiler -v &5\"") >&5
-+{ (eval echo "$as_me:1296: \"$ac_compiler -v &5\"") >&5
- (eval $ac_compiler -v &5) 2>&5
- ac_status=$?
-- echo "$as_me:1488: \$? = $ac_status" >&5
-+ echo "$as_me:1299: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:1490: \"$ac_compiler -V &5\"") >&5
-+{ (eval echo "$as_me:1301: \"$ac_compiler -V &5\"") >&5
- (eval $ac_compiler -V &5) 2>&5
- ac_status=$?
-- echo "$as_me:1493: \$? = $ac_status" >&5
-+ echo "$as_me:1304: \$? = $ac_status" >&5
- (exit $ac_status); }
-
- cat >conftest.$ac_ext <<_ACEOF
--#line 1497 "configure"
-+#line 1308 "configure"
- #include "confdefs.h"
-
- int
-@@ -1510,13 +1321,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:1324: 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:1327: \"$ac_link_default\"") >&5
- (eval $ac_link_default) 2>&5
- ac_status=$?
-- echo "$as_me:1519: \$? = $ac_status" >&5
-+ echo "$as_me:1330: \$? = $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 +1350,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:1353: 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:1359: 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:1364: 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:1370: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:1562: \$? = $ac_status" >&5
-+ echo "$as_me:1373: \$? = $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:1380: 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 +1385,24 @@
- fi
- fi
- fi
--echo "$as_me:1577: result: yes" >&5
-+echo "$as_me:1388: 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:1395: 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:1397: result: $cross_compiling" >&5
- echo "${ECHO_T}$cross_compiling" >&6
-
--echo "$as_me:1589: checking for executable suffix" >&5
-+echo "$as_me:1400: 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:1402: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:1594: \$? = $ac_status" >&5
-+ echo "$as_me:1405: \$? = $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 +1418,25 @@
- esac
- done
- else
-- { { echo "$as_me:1610: error: cannot compute EXEEXT: cannot compile and link" >&5
-+ { { echo "$as_me:1421: 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:1427: 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:1433: 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 1439 "configure"
- #include "confdefs.h"
-
- int
-@@ -1637,10 +1448,10 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:1640: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1451: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:1643: \$? = $ac_status" >&5
-+ echo "$as_me:1454: \$? = $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 +1463,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:1466: 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:1473: 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:1477: 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 1483 "configure"
- #include "confdefs.h"
-
- int
-@@ -1684,16 +1495,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1687: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1498: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:1690: \$? = $ac_status" >&5
-+ echo "$as_me:1501: \$? = $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:1504: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:1696: \$? = $ac_status" >&5
-+ echo "$as_me:1507: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_compiler_gnu=yes
- else
-@@ -1705,19 +1516,19 @@
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
--echo "$as_me:1708: result: $ac_cv_c_compiler_gnu" >&5
-+echo "$as_me:1519: 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:1525: 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 1531 "configure"
- #include "confdefs.h"
-
- int
-@@ -1729,16 +1540,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1732: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1543: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:1735: \$? = $ac_status" >&5
-+ echo "$as_me:1546: \$? = $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:1549: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:1741: \$? = $ac_status" >&5
-+ echo "$as_me:1552: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_prog_cc_g=yes
- else
-@@ -1748,7 +1559,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:1562: 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 +1586,16 @@
- #endif
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1778: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1589: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:1781: \$? = $ac_status" >&5
-+ echo "$as_me:1592: \$? = $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:1595: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:1787: \$? = $ac_status" >&5
-+ echo "$as_me:1598: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- for ac_declaration in \
- ''\
-@@ -1796,7 +1607,7 @@
- 'void exit (int);'
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 1799 "configure"
-+#line 1610 "configure"
- #include "confdefs.h"
- #include
- $ac_declaration
-@@ -1809,16 +1620,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1812: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1623: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:1815: \$? = $ac_status" >&5
-+ echo "$as_me:1626: \$? = $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:1629: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:1821: \$? = $ac_status" >&5
-+ echo "$as_me:1632: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
- else
-@@ -1828,7 +1639,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
--#line 1831 "configure"
-+#line 1642 "configure"
- #include "confdefs.h"
- $ac_declaration
- int
-@@ -1840,16 +1651,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1843: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1654: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:1846: \$? = $ac_status" >&5
-+ echo "$as_me:1657: \$? = $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:1660: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:1852: \$? = $ac_status" >&5
-+ echo "$as_me:1663: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
- else
-@@ -1879,68 +1690,259 @@
-
- GCC_VERSION=none
- if test "$GCC" = yes ; then
-- echo "$as_me:1882: checking version of $CC" >&5
-+ echo "$as_me:1693: 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.].*//'`"
-+ GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
- test -z "$GCC_VERSION" && GCC_VERSION=unknown
-- echo "$as_me:1886: result: $GCC_VERSION" >&5
-+ echo "$as_me:1697: result: $GCC_VERSION" >&5
- echo "${ECHO_T}$GCC_VERSION" >&6
- fi
-
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--ac_main_return=return
--echo "$as_me:1896: 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
-- CPP=
--fi
--if test -z "$CPP"; then
-- if test "${ac_cv_prog_CPP+set}" = set; then
-+echo "$as_me:1701: 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
- else
-- # Double quotes because CPP needs to be expanded
-- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-- do
-- ac_preproc_ok=false
--for ac_c_preproc_warn_flag in '' yes
--do
-- # Use a header file that comes with gcc, so configuring glibc
-- # with a fresh cross-compiler works.
-- # 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"
-+ ac_cv_prog_cc_stdc=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 1709 "configure"
- #include "confdefs.h"
--#include
-- Syntax error
-+#include
-+#include
-+#include
-+#include
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+ char **p;
-+ int i;
-+{
-+ return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+ char *s;
-+ va_list v;
-+ va_start (v,p);
-+ s = g (p, va_arg (v,int));
-+ va_end (v);
-+ return s;
-+}
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
-+ ;
-+ return 0;
-+}
- _ACEOF
--if { (eval echo "$as_me:1922: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+# Don't try gcc -ansi; that turns off useful extensions and
-+# breaks some systems' header files.
-+# AIX -qlanglvl=ansi
-+# Ultrix and OSF/1 -std1
-+# HP-UX 10.20 and later -Ae
-+# HP-UX older versions -Aa -D_HPUX_SOURCE
-+# SVR4 -Xc -D__EXTENSIONS__
-+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+ CC="$ac_save_CC $ac_arg"
-+ rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:1758: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
- ac_status=$?
-- egrep -v '^ *\+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:1928: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-- :
-+ echo "$as_me:1761: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:1764: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:1767: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_prog_cc_stdc=$ac_arg
-+break
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- # Broken: fails on valid input.
-+cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest.$ac_objext
-+done
-+rm -f conftest.$ac_ext conftest.$ac_objext
-+CC=$ac_save_CC
-+
-+fi
-+
-+case "x$ac_cv_prog_cc_stdc" in
-+ x|xno)
-+ echo "$as_me:1784: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6 ;;
-+ *)
-+ echo "$as_me:1787: result: $ac_cv_prog_cc_stdc" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-+ CC="$CC $ac_cv_prog_cc_stdc" ;;
-+esac
-+
-+# This should have been defined by AC_PROG_CC
-+: ${CC:=cc}
-+
-+echo "$as_me:1795: checking \$CC variable" >&5
-+echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
-+case "$CC" in #(vi
-+*[\ \ ]-[IUD]*)
-+ echo "$as_me:1799: result: broken" >&5
-+echo "${ECHO_T}broken" >&6
-+ { echo "$as_me:1801: 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 "x${cf_add_cflags}" != "x${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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
-+ && test -z "${cf_tst_cflags}" \
-+ && cf_fix_cppflags=no
-+ ;;
-+esac
-+done
-+
-+if test -n "$cf_new_cflags" ; then
-+
-+ 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:1887: result: ok" >&5
-+echo "${ECHO_T}ok" >&6
-+ ;;
-+esac
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+ac_main_return=return
-+echo "$as_me:1898: 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
-+ CPP=
-+fi
-+if test -z "$CPP"; then
-+ if test "${ac_cv_prog_CPP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # Double quotes because CPP needs to be expanded
-+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+ do
-+ ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+ # Use a header file that comes with gcc, so configuring glibc
-+ # with a fresh cross-compiler works.
-+ # 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 1919 "configure"
-+#include "confdefs.h"
-+#include
-+ Syntax error
-+_ACEOF
-+if { (eval echo "$as_me:1924: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ egrep -v '^ *\+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:1930: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ # Broken: fails on valid input.
- continue
- fi
- rm -f conftest.err conftest.$ac_ext
-@@ -1948,17 +1950,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 1953 "configure"
- #include "confdefs.h"
- #include
- _ACEOF
--if { (eval echo "$as_me:1955: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1957: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$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:1963: \$? = $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 +1997,7 @@
- else
- ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:1998: result: $CPP" >&5
-+echo "$as_me:2000: result: $CPP" >&5
- echo "${ECHO_T}$CPP" >&6
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
-@@ -2005,18 +2007,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 2010 "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:2015: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$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:2021: \$? = $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 +2041,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 2044 "configure"
- #include "confdefs.h"
- #include
- _ACEOF
--if { (eval echo "$as_me:2046: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2048: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$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:2054: \$? = $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 +2079,7 @@
- if $ac_preproc_ok; then
- :
- else
-- { { echo "$as_me:2080: error: C preprocessor \"$CPP\" fails sanity check" >&5
-+ { { echo "$as_me:2082: 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 +2092,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:2095: 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 2102 "configure"
- #include "confdefs.h"
- #include
- int Autoconf = TIOCGETP;
-@@ -2112,7 +2114,7 @@
-
- if test $ac_cv_prog_gcc_traditional = no; then
- cat >conftest.$ac_ext <<_ACEOF
--#line 2115 "configure"
-+#line 2117 "configure"
- #include "confdefs.h"
- #include
- int Autoconf = TCGETA;
-@@ -2125,14 +2127,14 @@
-
- fi
- fi
--echo "$as_me:2128: result: $ac_cv_prog_gcc_traditional" >&5
-+echo "$as_me:2130: 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:2137: 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 +2150,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:2153: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:2154: \$? = $ac_status" >&5
-+ echo "$as_me:2156: \$? = $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:2158: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:2159: \$? = $ac_status" >&5
-+ echo "$as_me:2161: \$? = $ac_status" >&5
- (exit $ac_status); };
- then
- eval cf_cv_prog_CC_c_o=yes
-@@ -2167,306 +2169,12 @@
-
- fi
- if test $cf_cv_prog_CC_c_o = yes; then
-- echo "$as_me:2170: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--else
-- echo "$as_me:2173: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--echo "$as_me:2177: 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:2172: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-- ISC=yes # If later tests want to check for ISC.
--
--cat >>confdefs.h <<\EOF
--#define _POSIX_SOURCE 1
--EOF
--
-- if test "$GCC" = yes; then
-- CC="$CC -posix"
-- else
-- CC="$CC -Xp"
-- fi
- else
-- echo "$as_me:2196: result: no" >&5
-+ echo "$as_me:2175: result: no" >&5
- echo "${ECHO_T}no" >&6
-- ISC=
--fi
--
--echo "$as_me:2201: 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
--else
--
--cf_cv_ansi_cc=no
--cf_save_CFLAGS="$CFLAGS"
--cf_save_CPPFLAGS="$CPPFLAGS"
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX -qlanglvl=ansi
--# Ultrix and OSF/1 -std1
--# HP-UX -Aa -D_HPUX_SOURCE
--# SVR4 -Xc
--# UnixWare 1.2 (cannot use -Xc, since ANSI/POSIX clashes)
--for cf_arg in "-DCC_HAS_PROTOS" \
-- "" \
-- -qlanglvl=ansi \
-- -std1 \
-- -Ae \
-- "-Aa -D_HPUX_SOURCE" \
-- -Xc
--do
--
--cf_fix_cppflags=no
--cf_new_cflags=
--cf_new_cppflags=
--cf_new_extra_cppflags=
--
--for cf_add_cflags in $cf_arg
--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
--
-- cat >conftest.$ac_ext <<_ACEOF
--#line 2305 "configure"
--#include "confdefs.h"
--
--#ifndef CC_HAS_PROTOS
--#if !defined(__STDC__) || (__STDC__ != 1)
--choke me
--#endif
--#endif
--
--int
--main ()
--{
--
-- int test (int i, double x);
-- struct s1 {int (*f) (int a);};
-- struct s2 {int (*f) (double a);};
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2326: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:2329: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:2332: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:2335: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- cf_cv_ansi_cc="$cf_arg"; break
--else
-- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--done
--CFLAGS="$cf_save_CFLAGS"
--CPPFLAGS="$cf_save_CPPFLAGS"
--
- fi
--echo "$as_me:2348: result: $cf_cv_ansi_cc" >&5
--echo "${ECHO_T}$cf_cv_ansi_cc" >&6
--
--if test "$cf_cv_ansi_cc" != "no"; then
--if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then
--
--cf_fix_cppflags=no
--cf_new_cflags=
--cf_new_cppflags=
--cf_new_extra_cppflags=
--
--for cf_add_cflags in $cf_cv_ansi_cc
--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
--
--else
-- cat >>confdefs.h <<\EOF
--#define CC_HAS_PROTOS 1
--EOF
--
--fi
--fi
--
--if test "$cf_cv_ansi_cc" = "no"; then
-- { { echo "$as_me:2441: 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
-- c. use a wrapper such as unproto" >&5
--echo "$as_me: 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
-- c. use a wrapper such as unproto" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--case $cf_cv_system_name in
--os2*)
-- CFLAGS="$CFLAGS -Zmt"
-- CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__"
-- CXXFLAGS="$CXXFLAGS -Zmt"
-- # autoconf's macro sets -Zexe and suffix both, which conflict:w
-- LDFLAGS="$LDFLAGS -Zmt -Zcrtdll"
-- ac_cv_exeext=.exe
-- ;;
--esac
--
--PROG_EXT="$EXEEXT"
--
--test -n "$PROG_EXT" && cat >>confdefs.h <&5
-+echo "$as_me:2196: 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 +2208,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:2211: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -2508,21 +2216,21 @@
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
-- echo "$as_me:2511: result: $AWK" >&5
-+ echo "$as_me:2219: result: $AWK" >&5
- echo "${ECHO_T}$AWK" >&6
- else
-- echo "$as_me:2514: result: no" >&5
-+ echo "$as_me:2222: 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:2229: 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:2233: 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 +2240,11 @@
- else ac_cv_prog_egrep='egrep'
- fi
- fi
--echo "$as_me:2535: result: $ac_cv_prog_egrep" >&5
-+echo "$as_me:2243: 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:2247: error: No egrep program found" >&5
- echo "$as_me: error: No egrep program found" >&2;}
- { (exit 1); exit 1; }; }
-
-@@ -2552,7 +2260,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:2263: 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 +2309,7 @@
- INSTALL=$ac_install_sh
- fi
- fi
--echo "$as_me:2604: result: $INSTALL" >&5
-+echo "$as_me:2312: result: $INSTALL" >&5
- echo "${ECHO_T}$INSTALL" >&6
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2612,18 +2320,18 @@
-
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
--echo "$as_me:2615: checking whether ln -s works" >&5
-+echo "$as_me:2323: 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:2327: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-- echo "$as_me:2622: result: no, using $LN_S" >&5
-+ echo "$as_me:2330: 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:2334: 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 +2343,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:2346: 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:2351: 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 +2387,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:2390: 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 +2399,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:2402: 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 +2409,7 @@
- else
- cf_pkg_config=yes
- fi;
--echo "$as_me:2704: result: $cf_pkg_config" >&5
-+echo "$as_me:2412: result: $cf_pkg_config" >&5
- echo "${ECHO_T}$cf_pkg_config" >&6
-
- case $cf_pkg_config in #(vi
-@@ -2709,10 +2417,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:2424: 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 +2438,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:2441: found $ac_dir/$ac_word" >&5
- break
- fi
- done
-@@ -2740,10 +2449,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:2452: result: $PKG_CONFIG" >&5
- echo "${ECHO_T}$PKG_CONFIG" >&6
- else
-- echo "$as_me:2746: result: no" >&5
-+ echo "$as_me:2455: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -2752,7 +2461,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:2464: 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 +2478,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:2481: found $ac_dir/$ac_word" >&5
- break
- fi
- done
-@@ -2781,10 +2490,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:2493: 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:2496: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -2815,7 +2524,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 +2536,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:2539: 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 +2545,48 @@
- 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:2548: 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
-+
-+ 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:2585: result: $PKG_CONFIG_LIBDIR" >&5
-+echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
- fi
-
--echo "$as_me:2867: checking if you want to build test-programs" >&5
-+echo "$as_me:2589: 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 +2596,10 @@
- else
- cf_with_tests=yes
- fi;
--echo "$as_me:2877: result: $cf_with_tests" >&5
-+echo "$as_me:2599: 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:2602: 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 +2609,11 @@
- else
- enable_mixedcase=auto
- fi;
--echo "$as_me:2890: result: $enable_mixedcase" >&5
-+echo "$as_me:2612: 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:2616: 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
-@@ -2899,7 +2621,7 @@
-
- if test "$cross_compiling" = yes ; then
- case $target_alias in #(vi
-- *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi
-+ *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) #(vi
- cf_cv_mixedcase=no
- ;;
- *)
-@@ -2918,9 +2640,10 @@
- fi
-
- fi
--echo "$as_me:2921: result: $cf_cv_mixedcase" >&5
-+echo "$as_me:2643: result: $cf_cv_mixedcase" >&5
- echo "${ECHO_T}$cf_cv_mixedcase" >&6
--test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
-+test "$cf_cv_mixedcase" = yes &&
-+cat >>confdefs.h <<\EOF
- #define MIXEDCASE_FILENAMES 1
- EOF
-
-@@ -2935,7 +2658,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:2661: 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 +2678,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:2681: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- SET_MAKE=
- else
-- echo "$as_me:2962: result: no" >&5
-+ echo "$as_me:2685: result: no" >&5
- echo "${ECHO_T}no" >&6
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-@@ -2968,7 +2691,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:2694: 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 +2706,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:2709: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -2991,10 +2714,10 @@
- fi
- CTAGS=$ac_cv_prog_CTAGS
- if test -n "$CTAGS"; then
-- echo "$as_me:2994: result: $CTAGS" >&5
-+ echo "$as_me:2717: result: $CTAGS" >&5
- echo "${ECHO_T}$CTAGS" >&6
- else
-- echo "$as_me:2997: result: no" >&5
-+ echo "$as_me:2720: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -3005,7 +2728,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:2731: 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 +2743,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:2746: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -3028,10 +2751,10 @@
- fi
- ETAGS=$ac_cv_prog_ETAGS
- if test -n "$ETAGS"; then
-- echo "$as_me:3031: result: $ETAGS" >&5
-+ echo "$as_me:2754: result: $ETAGS" >&5
- echo "${ECHO_T}$ETAGS" >&6
- else
-- echo "$as_me:3034: result: no" >&5
-+ echo "$as_me:2757: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -3040,7 +2763,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:2766: 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 +2778,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:2781: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -3064,17 +2787,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:2790: result: $MAKE_LOWER_TAGS" >&5
- echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
- else
-- echo "$as_me:3070: result: no" >&5
-+ echo "$as_me:2793: 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:2800: 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 +2812,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:2815: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -3098,10 +2821,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:2824: result: $MAKE_UPPER_TAGS" >&5
- echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
- else
-- echo "$as_me:3104: result: no" >&5
-+ echo "$as_me:2827: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -3121,7 +2844,7 @@
- MAKE_LOWER_TAGS="#"
- fi
-
--echo "$as_me:3124: checking for makeflags variable" >&5
-+echo "$as_me:2847: 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
-@@ -3137,7 +2860,7 @@
- CF_EOF
- cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[ ]*$,,'`
- case "$cf_result" in
-- .*k)
-+ .*k|.*kw)
- cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
- case "$cf_result" in
- .*CC=*) cf_cv_makeflags=
-@@ -3155,13 +2878,13 @@
- rm -f cf_makeflags.tmp
-
- fi
--echo "$as_me:3158: result: $cf_cv_makeflags" >&5
-+echo "$as_me:2881: 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:2887: 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 +2899,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:2902: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -3184,10 +2907,10 @@
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
-- echo "$as_me:3187: result: $RANLIB" >&5
-+ echo "$as_me:2910: result: $RANLIB" >&5
- echo "${ECHO_T}$RANLIB" >&6
- else
-- echo "$as_me:3190: result: no" >&5
-+ echo "$as_me:2913: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -3196,7 +2919,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:2922: 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 +2934,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:2937: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -3220,10 +2943,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:2946: result: $ac_ct_RANLIB" >&5
- echo "${ECHO_T}$ac_ct_RANLIB" >&6
- else
-- echo "$as_me:3226: result: no" >&5
-+ echo "$as_me:2949: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -3235,7 +2958,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:2961: 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 +2973,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:2976: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -3258,10 +2981,10 @@
- fi
- LD=$ac_cv_prog_LD
- if test -n "$LD"; then
-- echo "$as_me:3261: result: $LD" >&5
-+ echo "$as_me:2984: result: $LD" >&5
- echo "${ECHO_T}$LD" >&6
- else
-- echo "$as_me:3264: result: no" >&5
-+ echo "$as_me:2987: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -3270,7 +2993,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:2996: 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 +3008,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:3011: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -3294,10 +3017,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:3020: result: $ac_ct_LD" >&5
- echo "${ECHO_T}$ac_ct_LD" >&6
- else
-- echo "$as_me:3300: result: no" >&5
-+ echo "$as_me:3023: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -3309,7 +3032,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:3035: 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 +3047,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:3050: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -3332,10 +3055,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
-- echo "$as_me:3335: result: $AR" >&5
-+ echo "$as_me:3058: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
-- echo "$as_me:3338: result: no" >&5
-+ echo "$as_me:3061: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -3344,7 +3067,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:3070: 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 +3082,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:3085: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -3368,10 +3091,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:3094: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
-- echo "$as_me:3374: result: no" >&5
-+ echo "$as_me:3097: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -3383,7 +3106,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:3109: 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 +3121,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:3124: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -3406,10 +3129,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
-- echo "$as_me:3409: result: $AR" >&5
-+ echo "$as_me:3132: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
-- echo "$as_me:3412: result: no" >&5
-+ echo "$as_me:3135: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -3418,7 +3141,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:3144: 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 +3156,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:3159: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -3442,10 +3165,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:3168: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
-- echo "$as_me:3448: result: no" >&5
-+ echo "$as_me:3171: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -3454,7 +3177,7 @@
- AR="$ac_cv_prog_AR"
- fi
-
--echo "$as_me:3457: checking for options to update archives" >&5
-+echo "$as_me:3180: 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 +3200,13 @@
- rm -f conftest.a
-
- cat >conftest.$ac_ext <&5
-+ if { (eval echo "$as_me:3206: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:3486: \$? = $ac_status" >&5
-+ echo "$as_me:3209: \$? = $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 +3217,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}:3220: testing cannot compile test-program ..." 1>&5
-
- break
- fi
-@@ -3502,7 +3225,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:3228: result: $cf_cv_ar_flags" >&5
- echo "${ECHO_T}$cf_cv_ar_flags" >&6
-
- if test -n "$ARFLAGS" ; then
-@@ -3513,7 +3236,17 @@
- ARFLAGS=$cf_cv_ar_flags
- fi
-
--echo "$as_me:3516: checking if you have specified an install-prefix" >&5
-+ echo "$as_me:3239: checking for PATH separator" >&5
-+echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
-+ case $cf_cv_system_name in
-+ os2*) PATH_SEPARATOR=';' ;;
-+ *) ${PATH_SEPARATOR:=':'} ;;
-+ esac
-+
-+ echo "$as_me:3246: result: $PATH_SEPARATOR" >&5
-+echo "${ECHO_T}$PATH_SEPARATOR" >&6
-+
-+echo "$as_me:3249: 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 +3259,7 @@
- ;;
- esac
- fi;
--echo "$as_me:3529: result: $DESTDIR" >&5
-+echo "$as_me:3262: result: $DESTDIR" >&5
- echo "${ECHO_T}$DESTDIR" >&6
-
- ###############################################################################
-@@ -3554,7 +3287,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:3290: 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 +3302,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:3305: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -3577,10 +3310,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:3313: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- else
-- echo "$as_me:3583: result: no" >&5
-+ echo "$as_me:3316: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -3588,12 +3321,12 @@
- done
-
- fi;
-- echo "$as_me:3591: checking for native build C compiler" >&5
-+ echo "$as_me:3324: 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:3326: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
-
-- echo "$as_me:3596: checking for native build C preprocessor" >&5
-+ echo "$as_me:3329: 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 +3336,10 @@
- else
- BUILD_CPP='${BUILD_CC} -E'
- fi;
-- echo "$as_me:3606: result: $BUILD_CPP" >&5
-+ echo "$as_me:3339: result: $BUILD_CPP" >&5
- echo "${ECHO_T}$BUILD_CPP" >&6
-
-- echo "$as_me:3609: checking for native build C flags" >&5
-+ echo "$as_me:3342: 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 +3347,10 @@
- withval="$with_build_cflags"
- BUILD_CFLAGS="$withval"
- fi;
-- echo "$as_me:3617: result: $BUILD_CFLAGS" >&5
-+ echo "$as_me:3350: 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:3353: 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 +3358,10 @@
- withval="$with_build_cppflags"
- BUILD_CPPFLAGS="$withval"
- fi;
-- echo "$as_me:3628: result: $BUILD_CPPFLAGS" >&5
-+ echo "$as_me:3361: result: $BUILD_CPPFLAGS" >&5
- echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
-
-- echo "$as_me:3631: checking for native build linker-flags" >&5
-+ echo "$as_me:3364: 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 +3369,10 @@
- withval="$with_build_ldflags"
- BUILD_LDFLAGS="$withval"
- fi;
-- echo "$as_me:3639: result: $BUILD_LDFLAGS" >&5
-+ echo "$as_me:3372: result: $BUILD_LDFLAGS" >&5
- echo "${ECHO_T}$BUILD_LDFLAGS" >&6
-
-- echo "$as_me:3642: checking for native build linker-libraries" >&5
-+ echo "$as_me:3375: 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 +3380,7 @@
- withval="$with_build_libs"
- BUILD_LIBS="$withval"
- fi;
-- echo "$as_me:3650: result: $BUILD_LIBS" >&5
-+ echo "$as_me:3383: result: $BUILD_LIBS" >&5
- echo "${ECHO_T}$BUILD_LIBS" >&6
-
- # this assumes we're on Unix.
-@@ -3657,7 +3390,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:3393: 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 +3415,7 @@
- ### shared, for example.
- cf_list_models=""
-
--echo "$as_me:3685: checking if you want to build shared C-objects" >&5
-+echo "$as_me:3418: 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 +3425,27 @@
- else
- with_shared=no
- fi;
--echo "$as_me:3695: result: $with_shared" >&5
-+echo "$as_me:3428: 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:3432: 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:3435: 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:3440: 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:3443: 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:3448: 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 +3455,7 @@
- else
- cf_cv_curses_dir=no
- fi;
--echo "$as_me:3725: result: $cf_cv_curses_dir" >&5
-+echo "$as_me:3458: 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 +3474,7 @@
- ;;
- .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
- ;;
--.\${*prefix}*) #(vi
-+.\${*prefix}*|.\${*dir}*) #(vi
- eval withval="$withval"
- case ".$withval" in #(vi
- .NONE/*)
-@@ -3753,7 +3486,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:3489: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
- { (exit 1); exit 1; }; }
- ;;
-@@ -3786,7 +3519,7 @@
- cf_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- cat >conftest.$ac_ext <<_ACEOF
--#line 3789 "configure"
-+#line 3522 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -3798,16 +3531,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3801: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3534: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:3804: \$? = $ac_status" >&5
-+ echo "$as_me:3537: \$? = $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:3540: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:3810: \$? = $ac_status" >&5
-+ echo "$as_me:3543: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
- else
-@@ -3824,7 +3557,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}:3560: testing adding $cf_add_incdir to include-path ..." 1>&5
-
- CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-
-@@ -3858,7 +3591,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}:3594: testing adding $cf_add_libdir to library-path ..." 1>&5
-
- LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- fi
-@@ -3869,7 +3602,7 @@
- fi
- fi
-
--echo "$as_me:3872: checking if you want wide-character code" >&5
-+echo "$as_me:3605: 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 +3612,11 @@
- else
- with_widec=no
- fi;
--echo "$as_me:3882: result: $with_widec" >&5
-+echo "$as_me:3615: 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:3619: 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 +3624,7 @@
-
- cf_save_LIBS="$LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 3894 "configure"
-+#line 3627 "configure"
- #include "confdefs.h"
-
- #include
-@@ -3904,16 +3637,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:3907: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:3640: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:3910: \$? = $ac_status" >&5
-+ echo "$as_me:3643: \$? = $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:3646: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:3916: \$? = $ac_status" >&5
-+ echo "$as_me:3649: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_utf8_lib=yes
- else
-@@ -3925,12 +3658,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}:3661: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-
- cf_save_LIBS="$LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
--#line 3933 "configure"
-+#line 3666 "configure"
- #include "confdefs.h"
-
- #include
-@@ -3943,16 +3676,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:3946: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:3679: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:3949: \$? = $ac_status" >&5
-+ echo "$as_me:3682: \$? = $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:3685: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:3955: \$? = $ac_status" >&5
-+ echo "$as_me:3688: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
- cf_cv_find_linkage_utf8=yes
-@@ -3966,7 +3699,7 @@
- LIBS="-lutf8 $cf_save_LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
--#line 3969 "configure"
-+#line 3702 "configure"
- #include "confdefs.h"
-
- #include
-@@ -3979,16 +3712,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:3982: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:3715: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:3985: \$? = $ac_status" >&5
-+ echo "$as_me:3718: \$? = $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:3721: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:3991: \$? = $ac_status" >&5
-+ echo "$as_me:3724: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
- cf_cv_find_linkage_utf8=yes
-@@ -4005,9 +3738,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}:3741: 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}:3743: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-
- cf_save_CPPFLAGS="$CPPFLAGS"
- cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -4023,7 +3756,7 @@
- -I*)
- cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
-
--test "$cf_header_path" != "NONE" && \
-+test "x$cf_header_path" != "xNONE" && \
- test -d "$cf_header_path" && \
- {
- test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path"
-@@ -4044,18 +3777,7 @@
-
- cf_search=
-
--test "/usr" != "$prefix" && \
--test -d "/usr" && \
--(test $prefix = NONE || test "/usr" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for include-directories under /usr"
-- test -d /usr/include && cf_search="$cf_search /usr/include"
-- test -d /usr/include/utf8 && cf_search="$cf_search /usr/include/utf8"
-- test -d /usr/include/utf8/include && cf_search="$cf_search /usr/include/utf8/include"
-- test -d /usr/utf8/include && cf_search="$cf_search /usr/utf8/include"
-- test -d /usr/utf8/include/utf8 && cf_search="$cf_search /usr/utf8/include/utf8"
--}
--
--test "$prefix" != "NONE" && \
-+test "x$prefix" != "xNONE" && \
- test -d "$prefix" && \
- {
- test -n "$verbose" && echo " ... testing for include-directories under $prefix"
-@@ -4066,39 +3788,28 @@
- test -d $prefix/utf8/include/utf8 && cf_search="$cf_search $prefix/utf8/include/utf8"
- }
-
--test "/usr/local" != "$prefix" && \
--test -d "/usr/local" && \
--(test $prefix = NONE || test "/usr/local" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for include-directories under /usr/local"
-- test -d /usr/local/include && cf_search="$cf_search /usr/local/include"
-- test -d /usr/local/include/utf8 && cf_search="$cf_search /usr/local/include/utf8"
-- test -d /usr/local/include/utf8/include && cf_search="$cf_search /usr/local/include/utf8/include"
-- test -d /usr/local/utf8/include && cf_search="$cf_search /usr/local/utf8/include"
-- test -d /usr/local/utf8/include/utf8 && cf_search="$cf_search /usr/local/utf8/include/utf8"
--}
--
--test "/opt" != "$prefix" && \
--test -d "/opt" && \
--(test $prefix = NONE || test "/opt" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for include-directories under /opt"
-- test -d /opt/include && cf_search="$cf_search /opt/include"
-- test -d /opt/include/utf8 && cf_search="$cf_search /opt/include/utf8"
-- test -d /opt/include/utf8/include && cf_search="$cf_search /opt/include/utf8/include"
-- test -d /opt/utf8/include && cf_search="$cf_search /opt/utf8/include"
-- test -d /opt/utf8/include/utf8 && cf_search="$cf_search /opt/utf8/include/utf8"
--}
--
--test "$HOME" != "$prefix" && \
--test -d "$HOME" && \
--(test $prefix = NONE || test "$HOME" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for include-directories under $HOME"
-- test -d $HOME/include && cf_search="$cf_search $HOME/include"
-- test -d $HOME/include/utf8 && cf_search="$cf_search $HOME/include/utf8"
-- test -d $HOME/include/utf8/include && cf_search="$cf_search $HOME/include/utf8/include"
-- test -d $HOME/utf8/include && cf_search="$cf_search $HOME/utf8/include"
-- test -d $HOME/utf8/include/utf8 && cf_search="$cf_search $HOME/utf8/include/utf8"
-+for cf_subdir_prefix in \
-+ /usr \
-+ /usr/local \
-+ /usr/pkg \
-+ /opt \
-+ /opt/local \
-+ $HOME
-+do
-+
-+test "x$cf_subdir_prefix" != "x$prefix" && \
-+test -d "$cf_subdir_prefix" && \
-+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
-+ test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix"
-+ test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include"
-+ test -d $cf_subdir_prefix/include/utf8 && cf_search="$cf_search $cf_subdir_prefix/include/utf8"
-+ test -d $cf_subdir_prefix/include/utf8/include && cf_search="$cf_search $cf_subdir_prefix/include/utf8/include"
-+ test -d $cf_subdir_prefix/utf8/include && cf_search="$cf_search $cf_subdir_prefix/utf8/include"
-+ test -d $cf_subdir_prefix/utf8/include/utf8 && cf_search="$cf_search $cf_subdir_prefix/utf8/include/utf8"
- }
-
-+done
-+
- test "$includedir" != NONE && \
- test "$includedir" != "/usr/include" && \
- test -d "$includedir" && {
-@@ -4120,11 +3831,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}:3834: 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 3838 "configure"
- #include "confdefs.h"
-
- #include
-@@ -4137,21 +3848,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4140: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3851: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:4143: \$? = $ac_status" >&5
-+ echo "$as_me:3854: \$? = $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:3857: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:4149: \$? = $ac_status" >&5
-+ echo "$as_me:3860: \$? = $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}:3865: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-
- cf_cv_find_linkage_utf8=maybe
- cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -4169,7 +3880,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}:3883: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-
- cf_save_LIBS="$LIBS"
- cf_save_LDFLAGS="$LDFLAGS"
-@@ -4185,7 +3896,7 @@
- -L*)
- cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
-
--test "$cf_library_path" != "NONE" && \
-+test "x$cf_library_path" != "xNONE" && \
- test -d "$cf_library_path" && \
- {
- test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path"
-@@ -4204,18 +3915,7 @@
-
- cf_search=
-
--test "/usr" != "$prefix" && \
--test -d "/usr" && \
--(test $prefix = NONE || test "/usr" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for lib-directories under /usr"
-- test -d /usr/lib && cf_search="$cf_search /usr/lib"
-- test -d /usr/lib/utf8 && cf_search="$cf_search /usr/lib/utf8"
-- test -d /usr/lib/utf8/lib && cf_search="$cf_search /usr/lib/utf8/lib"
-- test -d /usr/utf8/lib && cf_search="$cf_search /usr/utf8/lib"
-- test -d /usr/utf8/lib/utf8 && cf_search="$cf_search /usr/utf8/lib/utf8"
--}
--
--test "$prefix" != "NONE" && \
-+test "x$prefix" != "xNONE" && \
- test -d "$prefix" && \
- {
- test -n "$verbose" && echo " ... testing for lib-directories under $prefix"
-@@ -4226,39 +3926,28 @@
- test -d $prefix/utf8/lib/utf8 && cf_search="$cf_search $prefix/utf8/lib/utf8"
- }
-
--test "/usr/local" != "$prefix" && \
--test -d "/usr/local" && \
--(test $prefix = NONE || test "/usr/local" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for lib-directories under /usr/local"
-- test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib"
-- test -d /usr/local/lib/utf8 && cf_search="$cf_search /usr/local/lib/utf8"
-- test -d /usr/local/lib/utf8/lib && cf_search="$cf_search /usr/local/lib/utf8/lib"
-- test -d /usr/local/utf8/lib && cf_search="$cf_search /usr/local/utf8/lib"
-- test -d /usr/local/utf8/lib/utf8 && cf_search="$cf_search /usr/local/utf8/lib/utf8"
--}
--
--test "/opt" != "$prefix" && \
--test -d "/opt" && \
--(test $prefix = NONE || test "/opt" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for lib-directories under /opt"
-- test -d /opt/lib && cf_search="$cf_search /opt/lib"
-- test -d /opt/lib/utf8 && cf_search="$cf_search /opt/lib/utf8"
-- test -d /opt/lib/utf8/lib && cf_search="$cf_search /opt/lib/utf8/lib"
-- test -d /opt/utf8/lib && cf_search="$cf_search /opt/utf8/lib"
-- test -d /opt/utf8/lib/utf8 && cf_search="$cf_search /opt/utf8/lib/utf8"
--}
--
--test "$HOME" != "$prefix" && \
--test -d "$HOME" && \
--(test $prefix = NONE || test "$HOME" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for lib-directories under $HOME"
-- test -d $HOME/lib && cf_search="$cf_search $HOME/lib"
-- test -d $HOME/lib/utf8 && cf_search="$cf_search $HOME/lib/utf8"
-- test -d $HOME/lib/utf8/lib && cf_search="$cf_search $HOME/lib/utf8/lib"
-- test -d $HOME/utf8/lib && cf_search="$cf_search $HOME/utf8/lib"
-- test -d $HOME/utf8/lib/utf8 && cf_search="$cf_search $HOME/utf8/lib/utf8"
-+for cf_subdir_prefix in \
-+ /usr \
-+ /usr/local \
-+ /usr/pkg \
-+ /opt \
-+ /opt/local \
-+ $HOME
-+do
-+
-+test "x$cf_subdir_prefix" != "x$prefix" && \
-+test -d "$cf_subdir_prefix" && \
-+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
-+ test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix"
-+ test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib"
-+ test -d $cf_subdir_prefix/lib/utf8 && cf_search="$cf_search $cf_subdir_prefix/lib/utf8"
-+ test -d $cf_subdir_prefix/lib/utf8/lib && cf_search="$cf_search $cf_subdir_prefix/lib/utf8/lib"
-+ test -d $cf_subdir_prefix/utf8/lib && cf_search="$cf_search $cf_subdir_prefix/utf8/lib"
-+ test -d $cf_subdir_prefix/utf8/lib/utf8 && cf_search="$cf_search $cf_subdir_prefix/utf8/lib/utf8"
- }
-
-+done
-+
- cf_search="$cf_library_path_list $cf_search"
-
- for cf_cv_library_path_utf8 in $cf_search
-@@ -4266,13 +3955,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}:3958: 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 3964 "configure"
- #include "confdefs.h"
-
- #include
-@@ -4285,21 +3974,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4288: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:3977: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:4291: \$? = $ac_status" >&5
-+ echo "$as_me:3980: \$? = $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:3983: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:4297: \$? = $ac_status" >&5
-+ echo "$as_me:3986: \$? = $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}:3991: 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,13 +4030,14 @@
- 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:4033: 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
- # ncurses/ncursesw:
- if test "$cf_cv_utf8_lib" = "add-on" ; then
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_LIBUTF8_H 1
- EOF
-
-@@ -4375,7 +4065,7 @@
- cf_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4378 "configure"
-+#line 4068 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -4387,16 +4077,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4390: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4080: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:4393: \$? = $ac_status" >&5
-+ echo "$as_me:4083: \$? = $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:4086: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:4399: \$? = $ac_status" >&5
-+ echo "$as_me:4089: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
- else
-@@ -4413,7 +4103,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}:4106: testing adding $cf_add_incdir to include-path ..." 1>&5
-
- CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-
-@@ -4447,71 +4137,140 @@
- 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}:4140: testing adding $cf_add_libdir to library-path ..." 1>&5
-+
-+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-+ fi
-+ fi
-+ done
-+fi
-+
-+cf_add_libs="$cf_cv_library_file_utf8"
-+# Filter out duplicates - this happens with badly-designed ".pc" files...
-+for cf_add_1lib in $LIBS
-+do
-+ for cf_add_2lib in $cf_add_libs
-+ do
-+ if test "x$cf_add_1lib" = "x$cf_add_2lib"
-+ then
-+ cf_add_1lib=
-+ break
-+ fi
-+ done
-+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+done
-+LIBS="$cf_add_libs"
-+
-+fi
-+
-+cf_ncuconfig_root=ncursesw
-+
-+echo "Looking for ${cf_ncuconfig_root}-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:4175: 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:4190: found $ac_dir/$ac_word" >&5
-+break
-+done
-
-- LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-- fi
-- fi
-- done
- fi
--
-- LIBS="$cf_cv_library_file_utf8 $LIBS"
-+fi
-+NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
-+if test -n "$NCURSES_CONFIG"; then
-+ echo "$as_me:4198: result: $NCURSES_CONFIG" >&5
-+echo "${ECHO_T}$NCURSES_CONFIG" >&6
-+else
-+ echo "$as_me:4201: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--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
-+ 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:4214: 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:4229: 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:4237: 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:4240: 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
-
- CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
--LIBS="`$NCURSES_CONFIG --libs` $LIBS"
-+
-+cf_add_libs="`$NCURSES_CONFIG --libs`"
-+# Filter out duplicates - this happens with badly-designed ".pc" files...
-+for cf_add_1lib in $LIBS
-+do
-+ for cf_add_2lib in $cf_add_libs
-+ do
-+ if test "x$cf_add_1lib" = "x$cf_add_2lib"
-+ then
-+ cf_add_1lib=
-+ break
-+ fi
-+ done
-+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+done
-+LIBS="$cf_add_libs"
-
- # 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:4273: 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 +4278,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 4287 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -4537,16 +4296,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4540: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4299: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:4543: \$? = $ac_status" >&5
-+ echo "$as_me:4302: \$? = $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:4305: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:4549: \$? = $ac_status" >&5
-+ echo "$as_me:4308: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_ncurses_header=$cf_header; break
- else
-@@ -4557,11 +4316,11 @@
- done
-
- fi
--echo "$as_me:4560: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:4319: 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:4323: error: No curses header-files found" >&5
- echo "$as_me: error: No curses header-files found" >&2;}
- { (exit 1); exit 1; }; }
- fi
-@@ -4571,23 +4330,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:4333: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&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 4339 "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:4343: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$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:4349: \$? = $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 +4365,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:4609: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:4368: result: `eval echo '${'$as_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 4421 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -4671,16 +4430,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4674: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4433: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:4677: \$? = $ac_status" >&5
-+ echo "$as_me:4436: \$? = $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:4439: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:4683: \$? = $ac_status" >&5
-+ echo "$as_me:4442: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
- else
-@@ -4697,7 +4456,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}:4459: testing adding $cf_add_incdir to include-path ..." 1>&5
-
- CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-
-@@ -4714,7 +4473,7 @@
-
- }
-
--echo "$as_me:4717: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:4476: 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 +4485,7 @@
- do
-
- cat >conftest.$ac_ext <<_ACEOF
--#line 4729 "configure"
-+#line 4488 "configure"
- #include "confdefs.h"
-
- #define _XOPEN_SOURCE_EXTENDED
-@@ -4758,16 +4517,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4761: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4520: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:4764: \$? = $ac_status" >&5
-+ echo "$as_me:4523: \$? = $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:4526: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:4770: \$? = $ac_status" >&5
-+ echo "$as_me:4529: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_ncurses_h=$cf_header
-
-@@ -4782,14 +4541,14 @@
- done
-
- fi
--echo "$as_me:4785: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:4544: 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:4551: 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
-@@ -4808,7 +4567,7 @@
- -I*)
- cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
-
--test "$cf_header_path" != "NONE" && \
-+test "x$cf_header_path" != "xNONE" && \
- test -d "$cf_header_path" && \
- {
- test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path"
-@@ -4829,18 +4588,7 @@
-
- cf_search=
-
--test "/usr" != "$prefix" && \
--test -d "/usr" && \
--(test $prefix = NONE || test "/usr" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for include-directories under /usr"
-- test -d /usr/include && cf_search="$cf_search /usr/include"
-- test -d /usr/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
-- test -d /usr/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include"
-- test -d /usr/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/$cf_ncuhdr_root/include"
-- test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
--}
--
--test "$prefix" != "NONE" && \
-+test "x$prefix" != "xNONE" && \
- test -d "$prefix" && \
- {
- test -n "$verbose" && echo " ... testing for include-directories under $prefix"
-@@ -4851,39 +4599,28 @@
- test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
- }
-
--test "/usr/local" != "$prefix" && \
--test -d "/usr/local" && \
--(test $prefix = NONE || test "/usr/local" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for include-directories under /usr/local"
-- test -d /usr/local/include && cf_search="$cf_search /usr/local/include"
-- test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
-- test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
-- test -d /usr/local/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
-- test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
--}
--
--test "/opt" != "$prefix" && \
--test -d "/opt" && \
--(test $prefix = NONE || test "/opt" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for include-directories under /opt"
-- test -d /opt/include && cf_search="$cf_search /opt/include"
-- test -d /opt/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
-- test -d /opt/include/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include"
-- test -d /opt/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/$cf_ncuhdr_root/include"
-- test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
--}
--
--test "$HOME" != "$prefix" && \
--test -d "$HOME" && \
--(test $prefix = NONE || test "$HOME" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for include-directories under $HOME"
-- test -d $HOME/include && cf_search="$cf_search $HOME/include"
-- test -d $HOME/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
-- test -d $HOME/include/$cf_ncuhdr_root/include && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include"
-- test -d $HOME/$cf_ncuhdr_root/include && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include"
-- test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-+for cf_subdir_prefix in \
-+ /usr \
-+ /usr/local \
-+ /usr/pkg \
-+ /opt \
-+ /opt/local \
-+ $HOME
-+do
-+
-+test "x$cf_subdir_prefix" != "x$prefix" && \
-+test -d "$cf_subdir_prefix" && \
-+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
-+ test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix"
-+ test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include"
-+ test -d $cf_subdir_prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root"
-+ test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include"
-+ test -d $cf_subdir_prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include"
-+ test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
- }
-
-+done
-+
- test "$includedir" != NONE && \
- test "$includedir" != "/usr/include" && \
- test -d "$includedir" && {
-@@ -4929,7 +4666,7 @@
- cf_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4932 "configure"
-+#line 4669 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -4941,16 +4678,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4944: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4681: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:4947: \$? = $ac_status" >&5
-+ echo "$as_me:4684: \$? = $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:4687: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:4953: \$? = $ac_status" >&5
-+ echo "$as_me:4690: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
- else
-@@ -4967,7 +4704,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}:4707: testing adding $cf_add_incdir to include-path ..." 1>&5
-
- CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-
-@@ -4988,7 +4725,7 @@
- do
-
- cat >conftest.$ac_ext <<_ACEOF
--#line 4991 "configure"
-+#line 4728 "configure"
- #include "confdefs.h"
-
- #include <$cf_header>
-@@ -5012,16 +4749,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5015: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4752: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:5018: \$? = $ac_status" >&5
-+ echo "$as_me:4755: \$? = $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:4758: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:5024: \$? = $ac_status" >&5
-+ echo "$as_me:4761: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_ncurses_h2=$cf_header
-
-@@ -5042,12 +4779,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:4782: 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:4787: 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 +4817,7 @@
- cf_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5083 "configure"
-+#line 4820 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -5092,16 +4829,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5095: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4832: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:5098: \$? = $ac_status" >&5
-+ echo "$as_me:4835: \$? = $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:4838: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:5104: \$? = $ac_status" >&5
-+ echo "$as_me:4841: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
- else
-@@ -5118,7 +4855,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}:4858: testing adding $cf_add_incdir to include-path ..." 1>&5
-
- CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-
-@@ -5139,7 +4876,8 @@
-
- case $cf_cv_ncurses_header in # (vi
- *ncurses.h)
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_NCURSES_H 1
- EOF
-
-@@ -5148,20 +4886,22 @@
-
- case $cf_cv_ncurses_header in # (vi
- ncurses/curses.h|ncurses/ncurses.h)
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_NCURSES_NCURSES_H 1
- EOF
-
- ;;
- ncursesw/curses.h|ncursesw/ncurses.h)
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_NCURSESW_NCURSES_H 1
- EOF
-
- ;;
- esac
-
--echo "$as_me:5164: checking for terminfo header" >&5
-+echo "$as_me:4904: 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 +4919,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 5182 "configure"
-+#line 4922 "configure"
- #include "confdefs.h"
- #include
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -5194,16 +4934,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5197: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4937: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:5200: \$? = $ac_status" >&5
-+ echo "$as_me:4940: \$? = $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:4943: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:5206: \$? = $ac_status" >&5
-+ echo "$as_me:4946: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
- cf_cv_term_header="$cf_test"
-@@ -5219,14 +4959,15 @@
- done
-
- fi
--echo "$as_me:5222: result: $cf_cv_term_header" >&5
-+echo "$as_me:4962: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
-
- # Set definitions to allow ifdef'ing to accommodate subdirectories
-
- case $cf_cv_term_header in # (vi
- *term.h)
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_TERM_H 1
- EOF
-
-@@ -5235,13 +4976,15 @@
-
- case $cf_cv_term_header in # (vi
- ncurses/term.h) #(vi
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_NCURSES_TERM_H 1
- EOF
-
- ;;
- ncursesw/term.h)
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_NCURSESW_TERM_H 1
- EOF
-
-@@ -5249,11 +4992,12 @@
- esac
-
- # some applications need this, but should check for NCURSES_VERSION
-+
- cat >>confdefs.h <<\EOF
- #define NCURSES 1
- EOF
-
--echo "$as_me:5256: checking for ncurses version" >&5
-+echo "$as_me:5000: 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 +5023,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:5026: \"$cf_try\"") >&5
- (eval $cf_try) 2>&5
- ac_status=$?
-- echo "$as_me:5285: \$? = $ac_status" >&5
-+ echo "$as_me:5029: \$? = $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 +5036,7 @@
-
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line 5295 "configure"
-+#line 5039 "configure"
- #include "confdefs.h"
-
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -5317,15 +5061,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:5320: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5064: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:5323: \$? = $ac_status" >&5
-+ echo "$as_me:5067: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:5325: \"$ac_try\"") >&5
-+ { (eval echo "$as_me:5069: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:5328: \$? = $ac_status" >&5
-+ echo "$as_me:5072: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
- cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -5339,9 +5083,10 @@
- rm -f $cf_tempfile
-
- fi
--echo "$as_me:5342: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:5086: result: $cf_cv_ncurses_version" >&5
- echo "${ECHO_T}$cf_cv_ncurses_version" >&6
--test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
-+test "$cf_cv_ncurses_version" = no ||
-+cat >>confdefs.h <<\EOF
- #define NCURSES 1
- EOF
-
-@@ -5351,7 +5096,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:5099: 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 +5104,7 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5362 "configure"
-+#line 5107 "configure"
- #include "confdefs.h"
-
- /* Override any gcc2 internal prototype to avoid an error. */
-@@ -5378,16 +5123,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5381: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5126: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:5384: \$? = $ac_status" >&5
-+ echo "$as_me:5129: \$? = $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:5132: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:5390: \$? = $ac_status" >&5
-+ echo "$as_me:5135: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -5398,10 +5143,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:5146: 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:5149: 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 +5154,7 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5412 "configure"
-+#line 5157 "configure"
- #include "confdefs.h"
-
- /* Override any gcc2 internal prototype to avoid an error. */
-@@ -5428,16 +5173,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5431: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5176: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:5434: \$? = $ac_status" >&5
-+ echo "$as_me:5179: \$? = $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:5182: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:5440: \$? = $ac_status" >&5
-+ echo "$as_me:5185: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_gpm_initscr=yes
- else
-@@ -5448,7 +5193,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:5196: 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 +5208,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:5211: 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 +5216,7 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5474 "configure"
-+#line 5219 "configure"
- #include "confdefs.h"
-
- /* Override any gcc2 internal prototype to avoid an error. */
-@@ -5490,16 +5235,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5493: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5238: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:5496: \$? = $ac_status" >&5
-+ echo "$as_me:5241: \$? = $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:5244: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:5502: \$? = $ac_status" >&5
-+ echo "$as_me:5247: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -5510,7 +5255,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:5258: 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"
-@@ -5520,22 +5265,52 @@
- ;;
- esac
-
--LIBS="$cf_ncurses_LIBS $LIBS"
-+cf_add_libs="$cf_ncurses_LIBS"
-+# Filter out duplicates - this happens with badly-designed ".pc" files...
-+for cf_add_1lib in $LIBS
-+do
-+ for cf_add_2lib in $cf_add_libs
-+ do
-+ if test "x$cf_add_1lib" = "x$cf_add_2lib"
-+ then
-+ cf_add_1lib=
-+ break
-+ fi
-+ done
-+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+done
-+LIBS="$cf_add_libs"
-
- if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
- then
-- LIBS="-l$cf_nculib_root $LIBS"
-+
-+cf_add_libs="-l$cf_nculib_root"
-+# Filter out duplicates - this happens with badly-designed ".pc" files...
-+for cf_add_1lib in $LIBS
-+do
-+ for cf_add_2lib in $cf_add_libs
-+ do
-+ if test "x$cf_add_1lib" = "x$cf_add_2lib"
-+ then
-+ cf_add_1lib=
-+ break
-+ fi
-+ done
-+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+done
-+LIBS="$cf_add_libs"
-+
- else
-
- eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- cf_libdir=""
-- echo "$as_me:5532: checking for initscr" >&5
-+ echo "$as_me:5307: 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 5313 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char initscr (); below. */
-@@ -5558,7 +5333,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 +5341,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5569: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5344: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:5572: \$? = $ac_status" >&5
-+ echo "$as_me:5347: \$? = $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:5350: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:5578: \$? = $ac_status" >&5
-+ echo "$as_me:5353: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_initscr=yes
- else
-@@ -5585,18 +5360,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:5363: 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:5370: 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 5374 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5608,25 +5383,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5611: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5386: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:5614: \$? = $ac_status" >&5
-+ echo "$as_me:5389: \$? = $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:5392: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:5620: \$? = $ac_status" >&5
-+ echo "$as_me:5395: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- echo "$as_me:5622: result: yes" >&5
-+ echo "$as_me:5397: 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:5404: result: no" >&5
- echo "${ECHO_T}no" >&6
-
- cf_search=
-@@ -5638,7 +5413,7 @@
- -L*)
- cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
-
--test "$cf_library_path" != "NONE" && \
-+test "x$cf_library_path" != "xNONE" && \
- test -d "$cf_library_path" && \
- {
- test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path"
-@@ -5657,18 +5432,7 @@
-
- cf_search=
-
--test "/usr" != "$prefix" && \
--test -d "/usr" && \
--(test $prefix = NONE || test "/usr" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for lib-directories under /usr"
-- test -d /usr/lib && cf_search="$cf_search /usr/lib"
-- test -d /usr/lib/$cf_nculib_root && cf_search="$cf_search /usr/lib/$cf_nculib_root"
-- test -d /usr/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/lib/$cf_nculib_root/lib"
-- test -d /usr/$cf_nculib_root/lib && cf_search="$cf_search /usr/$cf_nculib_root/lib"
-- test -d /usr/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
--}
--
--test "$prefix" != "NONE" && \
-+test "x$prefix" != "xNONE" && \
- test -d "$prefix" && \
- {
- test -n "$verbose" && echo " ... testing for lib-directories under $prefix"
-@@ -5679,48 +5443,37 @@
- test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
- }
-
--test "/usr/local" != "$prefix" && \
--test -d "/usr/local" && \
--(test $prefix = NONE || test "/usr/local" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for lib-directories under /usr/local"
-- test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib"
-- test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
-- test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
-- test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
-- test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
--}
--
--test "/opt" != "$prefix" && \
--test -d "/opt" && \
--(test $prefix = NONE || test "/opt" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for lib-directories under /opt"
-- test -d /opt/lib && cf_search="$cf_search /opt/lib"
-- test -d /opt/lib/$cf_nculib_root && cf_search="$cf_search /opt/lib/$cf_nculib_root"
-- test -d /opt/lib/$cf_nculib_root/lib && cf_search="$cf_search /opt/lib/$cf_nculib_root/lib"
-- test -d /opt/$cf_nculib_root/lib && cf_search="$cf_search /opt/$cf_nculib_root/lib"
-- test -d /opt/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
--}
--
--test "$HOME" != "$prefix" && \
--test -d "$HOME" && \
--(test $prefix = NONE || test "$HOME" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for lib-directories under $HOME"
-- test -d $HOME/lib && cf_search="$cf_search $HOME/lib"
-- test -d $HOME/lib/$cf_nculib_root && cf_search="$cf_search $HOME/lib/$cf_nculib_root"
-- test -d $HOME/lib/$cf_nculib_root/lib && cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib"
-- test -d $HOME/$cf_nculib_root/lib && cf_search="$cf_search $HOME/$cf_nculib_root/lib"
-- test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
-+for cf_subdir_prefix in \
-+ /usr \
-+ /usr/local \
-+ /usr/pkg \
-+ /opt \
-+ /opt/local \
-+ $HOME
-+do
-+
-+test "x$cf_subdir_prefix" != "x$prefix" && \
-+test -d "$cf_subdir_prefix" && \
-+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
-+ test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix"
-+ test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib"
-+ test -d $cf_subdir_prefix/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
-+ test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
-+ test -d $cf_subdir_prefix/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
-+ test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"
- }
-
-+done
-+
- cf_search="$cf_library_path_list $cf_search"
-
- for cf_libdir in $cf_search
- do
-- echo "$as_me:5719: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+ echo "$as_me:5472: 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 5476 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5732,25 +5485,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5735: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5488: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:5738: \$? = $ac_status" >&5
-+ echo "$as_me:5491: \$? = $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:5494: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:5744: \$? = $ac_status" >&5
-+ echo "$as_me:5497: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- echo "$as_me:5746: result: yes" >&5
-+ echo "$as_me:5499: 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:5506: result: no" >&5
- echo "${ECHO_T}no" >&6
- LIBS="$cf_save_LIBS"
- fi
-@@ -5765,7 +5518,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:5521: 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 +5526,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:5529: 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 +5536,7 @@
- fi
- done
- cat >conftest.$ac_ext <<_ACEOF
--#line 5786 "configure"
-+#line 5539 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5795,23 +5548,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5798: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5551: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:5801: \$? = $ac_status" >&5
-+ echo "$as_me:5554: \$? = $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:5557: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:5807: \$? = $ac_status" >&5
-+ echo "$as_me:5560: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- echo "$as_me:5809: result: yes" >&5
-+ echo "$as_me:5562: 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:5567: result: no" >&5
- echo "${ECHO_T}no" >&6
- LIBS="$cf_ncurses_SAVE"
- fi
-@@ -5831,57 +5584,111 @@
- 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:5593: 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:5608: 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:5616: result: $NCURSES_CONFIG" >&5
-+echo "${ECHO_T}$NCURSES_CONFIG" >&6
-+else
-+ echo "$as_me:5619: 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:5632: 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:5647: 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:5655: 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:5658: 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
-
- CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
--LIBS="`$NCURSES_CONFIG --libs` $LIBS"
-+
-+cf_add_libs="`$NCURSES_CONFIG --libs`"
-+# Filter out duplicates - this happens with badly-designed ".pc" files...
-+for cf_add_1lib in $LIBS
-+do
-+ for cf_add_2lib in $cf_add_libs
-+ do
-+ if test "x$cf_add_1lib" = "x$cf_add_2lib"
-+ then
-+ cf_add_1lib=
-+ break
-+ fi
-+ done
-+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+done
-+LIBS="$cf_add_libs"
-
- # 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:5691: 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 +5696,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 5705 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -5907,16 +5714,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5910: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5717: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:5913: \$? = $ac_status" >&5
-+ echo "$as_me:5720: \$? = $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:5723: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:5919: \$? = $ac_status" >&5
-+ echo "$as_me:5726: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_ncurses_header=$cf_header; break
- else
-@@ -5927,11 +5734,11 @@
- done
-
- fi
--echo "$as_me:5930: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:5737: 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:5741: error: No curses header-files found" >&5
- echo "$as_me: error: No curses header-files found" >&2;}
- { (exit 1); exit 1; }; }
- fi
-@@ -5941,23 +5748,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:5751: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&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 5757 "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:5761: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$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:5767: \$? = $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 +5783,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:5979: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:5786: result: `eval echo '${'$as_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 5839 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -6041,16 +5848,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6044: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5851: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:6047: \$? = $ac_status" >&5
-+ echo "$as_me:5854: \$? = $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:5857: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:6053: \$? = $ac_status" >&5
-+ echo "$as_me:5860: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
- else
-@@ -6067,7 +5874,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}:5877: testing adding $cf_add_incdir to include-path ..." 1>&5
-
- CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-
-@@ -6084,7 +5891,7 @@
-
- }
-
--echo "$as_me:6087: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:5894: 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 +5903,7 @@
- do
-
- cat >conftest.$ac_ext <<_ACEOF
--#line 6099 "configure"
-+#line 5906 "configure"
- #include "confdefs.h"
-
- #include <$cf_header>
-@@ -6120,16 +5927,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6123: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5930: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:6126: \$? = $ac_status" >&5
-+ echo "$as_me:5933: \$? = $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:5936: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:6132: \$? = $ac_status" >&5
-+ echo "$as_me:5939: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_ncurses_h=$cf_header
-
-@@ -6144,14 +5951,14 @@
- done
-
- fi
--echo "$as_me:6147: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:5954: 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:5961: 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
-@@ -6170,7 +5977,7 @@
- -I*)
- cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
-
--test "$cf_header_path" != "NONE" && \
-+test "x$cf_header_path" != "xNONE" && \
- test -d "$cf_header_path" && \
- {
- test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path"
-@@ -6191,18 +5998,7 @@
-
- cf_search=
-
--test "/usr" != "$prefix" && \
--test -d "/usr" && \
--(test $prefix = NONE || test "/usr" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for include-directories under /usr"
-- test -d /usr/include && cf_search="$cf_search /usr/include"
-- test -d /usr/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
-- test -d /usr/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include"
-- test -d /usr/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/$cf_ncuhdr_root/include"
-- test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
--}
--
--test "$prefix" != "NONE" && \
-+test "x$prefix" != "xNONE" && \
- test -d "$prefix" && \
- {
- test -n "$verbose" && echo " ... testing for include-directories under $prefix"
-@@ -6213,39 +6009,28 @@
- test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
- }
-
--test "/usr/local" != "$prefix" && \
--test -d "/usr/local" && \
--(test $prefix = NONE || test "/usr/local" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for include-directories under /usr/local"
-- test -d /usr/local/include && cf_search="$cf_search /usr/local/include"
-- test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
-- test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
-- test -d /usr/local/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
-- test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
--}
--
--test "/opt" != "$prefix" && \
--test -d "/opt" && \
--(test $prefix = NONE || test "/opt" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for include-directories under /opt"
-- test -d /opt/include && cf_search="$cf_search /opt/include"
-- test -d /opt/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
-- test -d /opt/include/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include"
-- test -d /opt/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/$cf_ncuhdr_root/include"
-- test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
--}
--
--test "$HOME" != "$prefix" && \
--test -d "$HOME" && \
--(test $prefix = NONE || test "$HOME" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for include-directories under $HOME"
-- test -d $HOME/include && cf_search="$cf_search $HOME/include"
-- test -d $HOME/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
-- test -d $HOME/include/$cf_ncuhdr_root/include && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include"
-- test -d $HOME/$cf_ncuhdr_root/include && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include"
-- test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-+for cf_subdir_prefix in \
-+ /usr \
-+ /usr/local \
-+ /usr/pkg \
-+ /opt \
-+ /opt/local \
-+ $HOME
-+do
-+
-+test "x$cf_subdir_prefix" != "x$prefix" && \
-+test -d "$cf_subdir_prefix" && \
-+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
-+ test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix"
-+ test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include"
-+ test -d $cf_subdir_prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root"
-+ test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include"
-+ test -d $cf_subdir_prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include"
-+ test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
- }
-
-+done
-+
- test "$includedir" != NONE && \
- test "$includedir" != "/usr/include" && \
- test -d "$includedir" && {
-@@ -6291,7 +6076,7 @@
- cf_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6294 "configure"
-+#line 6079 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -6303,16 +6088,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6306: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6091: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:6309: \$? = $ac_status" >&5
-+ echo "$as_me:6094: \$? = $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:6097: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:6315: \$? = $ac_status" >&5
-+ echo "$as_me:6100: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
- else
-@@ -6329,7 +6114,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}:6117: testing adding $cf_add_incdir to include-path ..." 1>&5
-
- CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-
-@@ -6350,7 +6135,7 @@
- do
-
- cat >conftest.$ac_ext <<_ACEOF
--#line 6353 "configure"
-+#line 6138 "configure"
- #include "confdefs.h"
-
- #include <$cf_header>
-@@ -6374,16 +6159,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6377: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6162: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:6380: \$? = $ac_status" >&5
-+ echo "$as_me:6165: \$? = $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:6168: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:6386: \$? = $ac_status" >&5
-+ echo "$as_me:6171: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_ncurses_h2=$cf_header
-
-@@ -6404,12 +6189,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:6192: 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:6197: 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 +6227,7 @@
- cf_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6445 "configure"
-+#line 6230 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -6454,16 +6239,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6457: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6242: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:6460: \$? = $ac_status" >&5
-+ echo "$as_me:6245: \$? = $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:6248: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:6466: \$? = $ac_status" >&5
-+ echo "$as_me:6251: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
- else
-@@ -6480,7 +6265,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}:6268: testing adding $cf_add_incdir to include-path ..." 1>&5
-
- CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-
-@@ -6501,7 +6286,8 @@
-
- case $cf_cv_ncurses_header in # (vi
- *ncurses.h)
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_NCURSES_H 1
- EOF
-
-@@ -6510,20 +6296,22 @@
-
- case $cf_cv_ncurses_header in # (vi
- ncurses/curses.h|ncurses/ncurses.h)
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_NCURSES_NCURSES_H 1
- EOF
-
- ;;
- ncursesw/curses.h|ncursesw/ncurses.h)
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_NCURSESW_NCURSES_H 1
- EOF
-
- ;;
- esac
-
--echo "$as_me:6526: checking for terminfo header" >&5
-+echo "$as_me:6314: 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 +6329,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 6544 "configure"
-+#line 6332 "configure"
- #include "confdefs.h"
- #include
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6556,16 +6344,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6559: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6347: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:6562: \$? = $ac_status" >&5
-+ echo "$as_me:6350: \$? = $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:6353: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:6568: \$? = $ac_status" >&5
-+ echo "$as_me:6356: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
- cf_cv_term_header="$cf_test"
-@@ -6581,14 +6369,15 @@
- done
-
- fi
--echo "$as_me:6584: result: $cf_cv_term_header" >&5
-+echo "$as_me:6372: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
-
- # Set definitions to allow ifdef'ing to accommodate subdirectories
-
- case $cf_cv_term_header in # (vi
- *term.h)
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_TERM_H 1
- EOF
-
-@@ -6597,13 +6386,15 @@
-
- case $cf_cv_term_header in # (vi
- ncurses/term.h) #(vi
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_NCURSES_TERM_H 1
- EOF
-
- ;;
- ncursesw/term.h)
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_NCURSESW_TERM_H 1
- EOF
-
-@@ -6611,11 +6402,12 @@
- esac
-
- # some applications need this, but should check for NCURSES_VERSION
-+
- cat >>confdefs.h <<\EOF
- #define NCURSES 1
- EOF
-
--echo "$as_me:6618: checking for ncurses version" >&5
-+echo "$as_me:6410: 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 +6433,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:6436: \"$cf_try\"") >&5
- (eval $cf_try) 2>&5
- ac_status=$?
-- echo "$as_me:6647: \$? = $ac_status" >&5
-+ echo "$as_me:6439: \$? = $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 +6446,7 @@
-
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line 6657 "configure"
-+#line 6449 "configure"
- #include "confdefs.h"
-
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6679,15 +6471,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:6682: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6474: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:6685: \$? = $ac_status" >&5
-+ echo "$as_me:6477: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:6687: \"$ac_try\"") >&5
-+ { (eval echo "$as_me:6479: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:6690: \$? = $ac_status" >&5
-+ echo "$as_me:6482: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
- cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -6701,9 +6493,10 @@
- rm -f $cf_tempfile
-
- fi
--echo "$as_me:6704: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:6496: result: $cf_cv_ncurses_version" >&5
- echo "${ECHO_T}$cf_cv_ncurses_version" >&6
--test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
-+test "$cf_cv_ncurses_version" = no ||
-+cat >>confdefs.h <<\EOF
- #define NCURSES 1
- EOF
-
-@@ -6713,7 +6506,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:6509: 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 +6514,7 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6724 "configure"
-+#line 6517 "configure"
- #include "confdefs.h"
-
- /* Override any gcc2 internal prototype to avoid an error. */
-@@ -6740,16 +6533,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6743: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6536: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:6746: \$? = $ac_status" >&5
-+ echo "$as_me:6539: \$? = $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:6542: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:6752: \$? = $ac_status" >&5
-+ echo "$as_me:6545: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -6760,10 +6553,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:6556: 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:6559: 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 +6564,7 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6774 "configure"
-+#line 6567 "configure"
- #include "confdefs.h"
-
- /* Override any gcc2 internal prototype to avoid an error. */
-@@ -6790,16 +6583,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6793: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6586: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:6796: \$? = $ac_status" >&5
-+ echo "$as_me:6589: \$? = $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:6592: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:6802: \$? = $ac_status" >&5
-+ echo "$as_me:6595: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_gpm_initscr=yes
- else
-@@ -6810,7 +6603,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:6606: 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 +6618,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:6621: 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 +6626,7 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6836 "configure"
-+#line 6629 "configure"
- #include "confdefs.h"
-
- /* Override any gcc2 internal prototype to avoid an error. */
-@@ -6852,16 +6645,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6855: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6648: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:6858: \$? = $ac_status" >&5
-+ echo "$as_me:6651: \$? = $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:6654: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:6864: \$? = $ac_status" >&5
-+ echo "$as_me:6657: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -6872,7 +6665,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:6668: 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"
-@@ -6882,22 +6675,52 @@
- ;;
- esac
-
--LIBS="$cf_ncurses_LIBS $LIBS"
-+cf_add_libs="$cf_ncurses_LIBS"
-+# Filter out duplicates - this happens with badly-designed ".pc" files...
-+for cf_add_1lib in $LIBS
-+do
-+ for cf_add_2lib in $cf_add_libs
-+ do
-+ if test "x$cf_add_1lib" = "x$cf_add_2lib"
-+ then
-+ cf_add_1lib=
-+ break
-+ fi
-+ done
-+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+done
-+LIBS="$cf_add_libs"
-
- if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
- then
-- LIBS="-l$cf_nculib_root $LIBS"
-+
-+cf_add_libs="-l$cf_nculib_root"
-+# Filter out duplicates - this happens with badly-designed ".pc" files...
-+for cf_add_1lib in $LIBS
-+do
-+ for cf_add_2lib in $cf_add_libs
-+ do
-+ if test "x$cf_add_1lib" = "x$cf_add_2lib"
-+ then
-+ cf_add_1lib=
-+ break
-+ fi
-+ done
-+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+done
-+LIBS="$cf_add_libs"
-+
- else
-
- eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- cf_libdir=""
-- echo "$as_me:6894: checking for initscr" >&5
-+ echo "$as_me:6717: 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 6723 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char initscr (); below. */
-@@ -6920,7 +6743,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 +6751,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6931: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6754: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:6934: \$? = $ac_status" >&5
-+ echo "$as_me:6757: \$? = $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:6760: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:6940: \$? = $ac_status" >&5
-+ echo "$as_me:6763: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_initscr=yes
- else
-@@ -6947,18 +6770,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:6773: 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:6780: 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 6784 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -6970,25 +6793,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6973: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6796: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:6976: \$? = $ac_status" >&5
-+ echo "$as_me:6799: \$? = $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:6802: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:6982: \$? = $ac_status" >&5
-+ echo "$as_me:6805: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- echo "$as_me:6984: result: yes" >&5
-+ echo "$as_me:6807: 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:6814: result: no" >&5
- echo "${ECHO_T}no" >&6
-
- cf_search=
-@@ -7000,7 +6823,7 @@
- -L*)
- cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
-
--test "$cf_library_path" != "NONE" && \
-+test "x$cf_library_path" != "xNONE" && \
- test -d "$cf_library_path" && \
- {
- test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path"
-@@ -7019,18 +6842,7 @@
-
- cf_search=
-
--test "/usr" != "$prefix" && \
--test -d "/usr" && \
--(test $prefix = NONE || test "/usr" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for lib-directories under /usr"
-- test -d /usr/lib && cf_search="$cf_search /usr/lib"
-- test -d /usr/lib/$cf_nculib_root && cf_search="$cf_search /usr/lib/$cf_nculib_root"
-- test -d /usr/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/lib/$cf_nculib_root/lib"
-- test -d /usr/$cf_nculib_root/lib && cf_search="$cf_search /usr/$cf_nculib_root/lib"
-- test -d /usr/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
--}
--
--test "$prefix" != "NONE" && \
-+test "x$prefix" != "xNONE" && \
- test -d "$prefix" && \
- {
- test -n "$verbose" && echo " ... testing for lib-directories under $prefix"
-@@ -7041,48 +6853,37 @@
- test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
- }
-
--test "/usr/local" != "$prefix" && \
--test -d "/usr/local" && \
--(test $prefix = NONE || test "/usr/local" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for lib-directories under /usr/local"
-- test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib"
-- test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
-- test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
-- test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
-- test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
--}
--
--test "/opt" != "$prefix" && \
--test -d "/opt" && \
--(test $prefix = NONE || test "/opt" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for lib-directories under /opt"
-- test -d /opt/lib && cf_search="$cf_search /opt/lib"
-- test -d /opt/lib/$cf_nculib_root && cf_search="$cf_search /opt/lib/$cf_nculib_root"
-- test -d /opt/lib/$cf_nculib_root/lib && cf_search="$cf_search /opt/lib/$cf_nculib_root/lib"
-- test -d /opt/$cf_nculib_root/lib && cf_search="$cf_search /opt/$cf_nculib_root/lib"
-- test -d /opt/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
--}
--
--test "$HOME" != "$prefix" && \
--test -d "$HOME" && \
--(test $prefix = NONE || test "$HOME" != "$prefix") && {
-- test -n "$verbose" && echo " ... testing for lib-directories under $HOME"
-- test -d $HOME/lib && cf_search="$cf_search $HOME/lib"
-- test -d $HOME/lib/$cf_nculib_root && cf_search="$cf_search $HOME/lib/$cf_nculib_root"
-- test -d $HOME/lib/$cf_nculib_root/lib && cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib"
-- test -d $HOME/$cf_nculib_root/lib && cf_search="$cf_search $HOME/$cf_nculib_root/lib"
-- test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
-+for cf_subdir_prefix in \
-+ /usr \
-+ /usr/local \
-+ /usr/pkg \
-+ /opt \
-+ /opt/local \
-+ $HOME
-+do
-+
-+test "x$cf_subdir_prefix" != "x$prefix" && \
-+test -d "$cf_subdir_prefix" && \
-+(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
-+ test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix"
-+ test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib"
-+ test -d $cf_subdir_prefix/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
-+ test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
-+ test -d $cf_subdir_prefix/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
-+ test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"
- }
-
-+done
-+
- cf_search="$cf_library_path_list $cf_search"
-
- for cf_libdir in $cf_search
- do
-- echo "$as_me:7081: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+ echo "$as_me:6882: 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 6886 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7094,25 +6895,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7097: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6898: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:7100: \$? = $ac_status" >&5
-+ echo "$as_me:6901: \$? = $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:6904: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:7106: \$? = $ac_status" >&5
-+ echo "$as_me:6907: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- echo "$as_me:7108: result: yes" >&5
-+ echo "$as_me:6909: 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:6916: result: no" >&5
- echo "${ECHO_T}no" >&6
- LIBS="$cf_save_LIBS"
- fi
-@@ -7127,7 +6928,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:6931: 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 +6936,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:6939: 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 +6946,7 @@
- fi
- done
- cat >conftest.$ac_ext <<_ACEOF
--#line 7148 "configure"
-+#line 6949 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7157,23 +6958,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7160: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6961: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:7163: \$? = $ac_status" >&5
-+ echo "$as_me:6964: \$? = $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:6967: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:7169: \$? = $ac_status" >&5
-+ echo "$as_me:6970: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- echo "$as_me:7171: result: yes" >&5
-+ echo "$as_me:6972: 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:6977: result: no" >&5
- echo "${ECHO_T}no" >&6
- LIBS="$cf_ncurses_SAVE"
- fi
-@@ -7210,10 +7011,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:7014: \"$cf_try\"") >&5
- (eval $cf_try) 2>&5
- ac_status=$?
-- echo "$as_me:7216: \$? = $ac_status" >&5
-+ echo "$as_me:7017: \$? = $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 +7032,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:7035: 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:7038: 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:7048: 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 +7060,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 +7076,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:7079: 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 +7084,11 @@
- profile) LD_MODEL='-pg';;
- shared) LD_MODEL='' ;;
- esac
--echo "$as_me:7265: result: $LD_MODEL" >&5
-+echo "$as_me:7087: 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:7091: 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 +7101,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 +7119,33 @@
- *)
- ;;
- esac
--echo "$as_me:7300: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:7122: 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:7127: 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"
-+
-+cf_add_libs="${LD_RPATH_OPT}$libdir"
-+# Filter out duplicates - this happens with badly-designed ".pc" files...
-+for cf_add_1lib in $LIBS
-+do
-+ for cf_add_2lib in $cf_add_libs
-+ do
-+ if test "x$cf_add_1lib" = "x$cf_add_2lib"
-+ then
-+ cf_add_1lib=
-+ break
-+ fi
-+ done
-+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+done
-+LIBS="$cf_add_libs"
-+
- cat >conftest.$ac_ext <<_ACEOF
--#line 7310 "configure"
-+#line 7148 "configure"
- #include "confdefs.h"
-
- int
-@@ -7319,16 +7157,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7322: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7160: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:7325: \$? = $ac_status" >&5
-+ echo "$as_me:7163: \$? = $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:7166: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:7331: \$? = $ac_status" >&5
-+ echo "$as_me:7169: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_rpath_space=no
- else
-@@ -7338,22 +7176,28 @@
- 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:7179: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- ;;
- esac
-
-+ RM_SHARED_OPTS=
- LOCAL_LDFLAGS=
- LOCAL_LDFLAGS2=
- LD_SHARED_OPTS=
- INSTALL_LIB="-m 644"
-+ : ${rel_builddir:=.}
-+
-+ shlibdir=$libdir
-+
-+ MAKE_DLLS="#"
-
- cf_cv_do_symlinks=no
- 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:7200: 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 +7212,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:7215: 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,23 +7221,24 @@
- else
- cf_cv_shlib_version=auto
- fi;
-- echo "$as_me:7380: result: $cf_cv_shlib_version" >&5
-+ echo "$as_me:7224: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
-
- cf_cv_rm_so_locs=no
-+ cf_try_cflags=
-
- # Some less-capable ports of gcc support only -fpic
- CC_SHARED_OPTS=
- if test "$GCC" = yes
- then
-- echo "$as_me:7389: checking which $CC option to use" >&5
-+ echo "$as_me:7234: 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 7241 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -7405,16 +7250,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7408: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7253: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:7411: \$? = $ac_status" >&5
-+ echo "$as_me:7256: \$? = $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:7259: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:7417: \$? = $ac_status" >&5
-+ echo "$as_me:7262: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
- else
-@@ -7423,7 +7268,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- done
-- echo "$as_me:7426: result: $CC_SHARED_OPTS" >&5
-+ echo "$as_me:7271: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- CFLAGS="$cf_save_CFLAGS"
- fi
-@@ -7431,10 +7276,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
-@@ -7442,9 +7291,12 @@
- ;;
- cygwin*) #(vi
- CC_SHARED_OPTS=
-- MK_SHARED_LIB='sh ../mk_shared_lib.sh $@ ${CC} ${CFLAGS}'
-+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}'
-+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
- cf_cv_shlib_version=cygdll
- cf_cv_shlib_version_infix=cygdll
-+ shlibdir=$bindir
-+ MAKE_DLLS=
- cat >mk_shared_lib.sh <<-CF_EOF
- #!/bin/sh
- SHARED_LIB=\$1
-@@ -7455,17 +7307,39 @@
- ** 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}
-+ exec \$* -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
-+CF_EOF
-+ chmod +x mk_shared_lib.sh
-+ ;;
-+ msys*) #(vi
-+ CC_SHARED_OPTS=
-+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}'
-+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
-+ cf_cv_shlib_version=msysdll
-+ cf_cv_shlib_version_infix=msysdll
-+ shlibdir=$bindir
-+ MAKE_DLLS=
-+ cat >mk_shared_lib.sh <<-CF_EOF
-+ #!/bin/sh
-+ SHARED_LIB=\$1
-+ IMPORT_LIB=\`echo "\$1" | sed -e 's/msys-/lib/' -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=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB}
- CF_EOF
- chmod +x mk_shared_lib.sh
- ;;
- darwin*) #(vi
-- EXTRA_CFLAGS="-no-cpp-precomp"
-+ cf_try_cflags="no-cpp-precomp"
- CC_SHARED_OPTS="-dynamic"
- 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:7342: 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 +7348,7 @@
- cf_save_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- cat >conftest.$ac_ext <<_ACEOF
--#line 7477 "configure"
-+#line 7351 "configure"
- #include "confdefs.h"
-
- int
-@@ -7486,16 +7360,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7489: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7363: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:7492: \$? = $ac_status" >&5
-+ echo "$as_me:7366: \$? = $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:7369: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:7498: \$? = $ac_status" >&5
-+ echo "$as_me:7372: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_ldflags_search_paths_first=yes
- else
-@@ -7506,12 +7380,20 @@
- 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:7383: 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"
- fi
- ;;
-+ hpux[7-8]*) #(vi
-+ # HP-UX 8.07 ld lacks "+b" option used for libdir search-list
-+ if test "$GCC" != yes; then
-+ CC_SHARED_OPTS='+Z'
-+ fi
-+ MK_SHARED_LIB='${LD} -b -o $@'
-+ INSTALL_LIB="-m 555"
-+ ;;
- hpux*) #(vi
- # (tested with gcc 2.7.2 -- I don't have c89)
- if test "$GCC" = yes; then
-@@ -7525,9 +7407,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 +7436,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 +7448,40 @@
-
- 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
-+ shlibdir=$bindir
-+ MAKE_DLLS=
-+ if test "$DFT_LWR_MODEL" = "shared" ; then
-+ LOCAL_LDFLAGS="-Wl,--enable-auto-import"
-+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
-+ EXTRA_LDFLAGS="-Wl,--enable-auto-import $EXTRA_LDFLAGS"
-+ fi
-+ CC_SHARED_OPTS=
-+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}'
-+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
-+ 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,--enable-auto-import,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${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 +7499,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 +7521,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
-@@ -7620,7 +7539,7 @@
-
- MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@'
- else
-- MK_SHARED_LIB='${LD} -shared -Bshareable -o $@'
-+ MK_SHARED_LIB='${CC} -Wl,-shared -Wl,-Bshareable -o $@'
- fi
- ;;
- osf*|mls+*) #(vi
-@@ -7686,7 +7605,7 @@
- do
- CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 7689 "configure"
-+#line 7608 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -7698,16 +7617,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7701: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7620: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:7704: \$? = $ac_status" >&5
-+ echo "$as_me:7623: \$? = $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:7626: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:7710: \$? = $ac_status" >&5
-+ echo "$as_me:7629: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
- else
-@@ -7744,22 +7663,65 @@
- test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- ;;
- *)
-- { echo "$as_me:7747: WARNING: ignored --with-shlib-version" >&5
-+ { echo "$as_me:7666: 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}"
-+ if test -n "$cf_try_cflags"
-+ then
-+cat > conftest.$ac_ext <
-+int main(int argc, char *argv[])
-+{
-+ printf("hello\n");
-+ return (argv[argc-1] == 0) ;
-+}
-+EOF
-+ cf_save_CFLAGS="$CFLAGS"
-+ for cf_opt in $cf_try_cflags
-+ do
-+ CFLAGS="$cf_save_CFLAGS -$cf_opt"
-+ echo "$as_me:7688: checking if CFLAGS option -$cf_opt works" >&5
-+echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
-+ if { (eval echo "$as_me:7690: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7693: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ echo "$as_me:7695: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ cf_save_CFLAGS="$CFLAGS"
-+ else
-+ echo "$as_me:7699: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ fi
-+ done
-+ CFLAGS="$cf_save_CFLAGS"
- 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 $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations"
-+
-+ test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
-+
-+echo "${as_me:-configure}:7714: 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}:7718: 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:7724: 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 +7731,7 @@
- else
- with_rpath_link=yes
- fi;
-- echo "$as_me:7772: result: $with_rpath_link" >&5
-+ echo "$as_me:7734: result: $with_rpath_link" >&5
- echo "${ECHO_T}$with_rpath_link" >&6
- if test "$with_rpath_link" = no
- then
-@@ -7780,13 +7742,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:7746: 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 +7753,7 @@
- else
- with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--echo "$as_me:7799: result: $with_broken_linker" >&5
-+echo "$as_me:7756: result: $with_broken_linker" >&5
- echo "${ECHO_T}$with_broken_linker" >&6
-
- BROKEN_LINKER=0
-@@ -7816,7 +7773,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}:7776: testing cygwin linker is broken anyway ..." 1>&5
-
- ;;
- esac
-@@ -7829,10 +7786,10 @@
- cf_xopen_source=
-
- case $host_os in #(vi
--aix[456]*) #(vi
-+aix[4-7]*) #(vi
- cf_xopen_source="-D_ALL_SOURCE"
- ;;
--cygwin) #(vi
-+cygwin|msys) #(vi
- cf_XOPEN_SOURCE=600
- ;;
- darwin[0-8].*) #(vi
-@@ -7840,6 +7797,7 @@
- ;;
- darwin*) #(vi
- cf_xopen_source="-D_DARWIN_C_SOURCE"
-+ cf_XOPEN_SOURCE=
- ;;
- freebsd*|dragonfly*) #(vi
- # 5.x headers associate
-@@ -7857,17 +7815,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:7822: 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 7829 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -7882,16 +7841,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7885: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7844: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:7888: \$? = $ac_status" >&5
-+ echo "$as_me:7847: \$? = $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:7850: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:7894: \$? = $ac_status" >&5
-+ echo "$as_me:7853: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_gnu_source=no
- else
-@@ -7900,7 +7859,7 @@
- cf_save="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- cat >conftest.$ac_ext <<_ACEOF
--#line 7903 "configure"
-+#line 7862 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -7915,16 +7874,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7918: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7877: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:7921: \$? = $ac_status" >&5
-+ echo "$as_me:7880: \$? = $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:7883: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:7927: \$? = $ac_status" >&5
-+ echo "$as_me:7886: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_gnu_source=no
- else
-@@ -7932,23 +7891,270 @@
- cat conftest.$ac_ext >&5
- cf_cv_gnu_source=yes
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-- CPPFLAGS="$cf_save"
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ CPPFLAGS="$cf_save"
-+
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+echo "$as_me:7901: 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"
-+
-+ ;;
-+minix*) #(vi
-+ cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
-+ ;;
-+mirbsd*) #(vi
-+ # 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:7926: 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}:7932: testing if the symbol is already defined go no further ..." 1>&5
-+
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 7935 "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:7950: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7953: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:7956: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7959: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ cf_cv_posix_c_source=no
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+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 7980 "configure"
-+#include "confdefs.h"
-+#include
-+int
-+main ()
-+{
-+
-+#ifdef _POSIX_SOURCE
-+make an error
-+#endif
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:7995: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7998: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:8001: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:8004: \$? = $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="$cf_cv_posix_c_source -D_POSIX_SOURCE"
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ fi
-+
-+echo "${as_me:-configure}:8015: 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}:8020: testing if the second compile does not leave our definition intact error ..." 1>&5
-+
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 8023 "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:8038: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:8041: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:8044: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:8047: \$? = $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:8063: 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 "x${cf_add_cflags}" != "x${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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
-+ && test -z "${cf_tst_cflags}" \
-+ && cf_fix_cppflags=no
-+ ;;
-+esac
-+done
-+
-+if test -n "$cf_new_cflags" ; then
-+
-+ 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
--rm -f conftest.$ac_objext conftest.$ac_ext
-
- fi
--echo "$as_me:7942: 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
-+ 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
-@@ -7962,23 +8168,30 @@
- 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__"
-+ cf_cv_xopen_source=broken
-+ ;;
-+sysv4.2uw2.*) # Novell/SCO UnixWare 2.x (tested on 2.1.2)
-+ cf_XOPEN_SOURCE=
-+ cf_POSIX_C_SOURCE=
- ;;
- *)
-- echo "$as_me:7972: checking if we should define _XOPEN_SOURCE" >&5
-+
-+echo "$as_me:8181: 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 7979 "configure"
-+#line 8188 "configure"
- #include "confdefs.h"
-+
-+#include
-+#include
- #include
-+
- int
- main ()
- {
-@@ -7991,16 +8204,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7994: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8207: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:7997: \$? = $ac_status" >&5
-+ echo "$as_me:8210: \$? = $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:8213: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:8003: \$? = $ac_status" >&5
-+ echo "$as_me:8216: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_xopen_source=no
- else
-@@ -8009,9 +8222,13 @@
- cf_save="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8012 "configure"
-+#line 8225 "configure"
- #include "confdefs.h"
-+
-+#include
-+#include
- #include
-+
- int
- main ()
- {
-@@ -8024,16 +8241,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8027: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8244: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:8030: \$? = $ac_status" >&5
-+ echo "$as_me:8247: \$? = $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:8250: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:8036: \$? = $ac_status" >&5
-+ echo "$as_me:8253: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_xopen_source=no
- else
-@@ -8048,9 +8265,10 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
-
- fi
--echo "$as_me:8051: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8268: 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 +8278,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=
-@@ -8077,7 +8295,7 @@
- -D*)
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
-
-- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=yes
-
-@@ -8118,7 +8336,7 @@
-
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
-
-- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=no
- ;;
-@@ -8140,7 +8358,7 @@
- EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
-
-- fi
-+fi
-
- cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
-
-@@ -8155,16 +8373,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:8376: 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}:8382: testing if the symbol is already defined go no further ..." 1>&5
-
- cat >conftest.$ac_ext <<_ACEOF
--#line 8167 "configure"
-+#line 8385 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -8179,16 +8397,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8182: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8400: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:8185: \$? = $ac_status" >&5
-+ echo "$as_me:8403: \$? = $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:8406: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:8191: \$? = $ac_status" >&5
-+ echo "$as_me:8409: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_posix_c_source=no
- else
-@@ -8209,7 +8427,7 @@
- esac
- if test "$cf_want_posix_source" = yes ; then
- cat >conftest.$ac_ext <<_ACEOF
--#line 8212 "configure"
-+#line 8430 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -8224,16 +8442,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8227: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8445: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:8230: \$? = $ac_status" >&5
-+ echo "$as_me:8448: \$? = $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:8451: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:8236: \$? = $ac_status" >&5
-+ echo "$as_me:8454: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
- else
-@@ -8244,15 +8462,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}:8465: 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}:8470: testing if the second compile does not leave our definition intact error ..." 1>&5
-
- cat >conftest.$ac_ext <<_ACEOF
--#line 8255 "configure"
-+#line 8473 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -8267,16 +8485,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8270: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8488: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:8273: \$? = $ac_status" >&5
-+ echo "$as_me:8491: \$? = $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:8494: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:8279: \$? = $ac_status" >&5
-+ echo "$as_me:8497: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
- else
-@@ -8292,7 +8510,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
-
- fi
--echo "$as_me:8295: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8513: 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
-@@ -8314,7 +8532,92 @@
- -D*)
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
-
-- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
-+ && test -z "${cf_tst_cflags}" \
-+ && cf_fix_cppflags=yes
-+
-+ if test $cf_fix_cppflags = yes ; then
-+ 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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
-+ && test -z "${cf_tst_cflags}" \
-+ && cf_fix_cppflags=no
-+ ;;
-+esac
-+done
-+
-+if test -n "$cf_new_cflags" ; then
-+
-+ 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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=yes
-
-@@ -8355,7 +8658,7 @@
-
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
-
-- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=no
- ;;
-@@ -8363,33 +8666,221 @@
- done
-
- if test -n "$cf_new_cflags" ; then
-+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
-+
-+echo "${as_me:-configure}:8671: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-
- CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-
- if test -n "$cf_new_cppflags" ; then
-+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
-+
-+echo "${as_me:-configure}:8679: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-
- CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-
- if test -n "$cf_new_extra_cppflags" ; then
-+ test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
-+
-+echo "${as_me:-configure}:8687: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-
- EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
-
- fi
-
-- ;;
--esac
-+if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-+ echo "$as_me:8695: 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 8698 "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:8713: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:8716: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:8719: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:8722: \$? = $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:8731: 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 8736 "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:8751: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:8754: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:8757: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:8760: \$? = $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:8771: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
-+ fi
-+ else
-+
-+echo "$as_me:8776: 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 8783 "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:8802: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:8805: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:8808: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:8811: \$? = $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 8820 "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:8839: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:8842: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:8845: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:8848: \$? = $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:8863: result: $cf_cv_xopen_source" >&5
-+echo "${ECHO_T}$cf_cv_xopen_source" >&6
-+
-+if test "$cf_cv_xopen_source" != no ; 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'`
-
--if test -n "$cf_xopen_source" ; then
-+ 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)
-@@ -8399,7 +8890,7 @@
- -D*)
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
-
-- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=yes
-
-@@ -8440,7 +8931,7 @@
-
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
-
-- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=no
- ;;
-@@ -8464,6 +8955,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 +8965,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:8968: 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 +8977,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 8980 "configure"
- #include "confdefs.h"
- #include
- /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -8503,16 +8997,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8506: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9000: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:8509: \$? = $ac_status" >&5
-+ echo "$as_me:9003: \$? = $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:9006: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:8515: \$? = $ac_status" >&5
-+ echo "$as_me:9009: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
- else
-@@ -8522,16 +9016,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:9019: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:8528: \$? = $ac_status" >&5
-+ echo "$as_me:9022: \$? = $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:9025: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:8534: \$? = $ac_status" >&5
-+ echo "$as_me:9028: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -8545,13 +9039,13 @@
- rm -f conftest.$ac_ext
- fi
- fi
--echo "$as_me:8548: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:9042: 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:9048: 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 +9053,7 @@
- while :; do
- ac_cv_sys_file_offset_bits=no
- cat >conftest.$ac_ext <<_ACEOF
--#line 8562 "configure"
-+#line 9056 "configure"
- #include "confdefs.h"
- #include
- /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -8579,16 +9073,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8582: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9076: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:8585: \$? = $ac_status" >&5
-+ echo "$as_me:9079: \$? = $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:9082: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:8591: \$? = $ac_status" >&5
-+ echo "$as_me:9085: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
- else
-@@ -8597,7 +9091,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
--#line 8600 "configure"
-+#line 9094 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include
-@@ -8618,16 +9112,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8621: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9115: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:8624: \$? = $ac_status" >&5
-+ echo "$as_me:9118: \$? = $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:9121: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:8630: \$? = $ac_status" >&5
-+ echo "$as_me:9124: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sys_file_offset_bits=64; break
- else
-@@ -8638,7 +9132,7 @@
- break
- done
- fi
--echo "$as_me:8641: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:9135: 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 +9142,7 @@
-
- fi
- rm -rf conftest*
-- echo "$as_me:8651: checking for _LARGE_FILES value needed for large files" >&5
-+ echo "$as_me:9145: 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 +9150,7 @@
- while :; do
- ac_cv_sys_large_files=no
- cat >conftest.$ac_ext <<_ACEOF
--#line 8659 "configure"
-+#line 9153 "configure"
- #include "confdefs.h"
- #include
- /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -8676,16 +9170,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8679: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9173: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:8682: \$? = $ac_status" >&5
-+ echo "$as_me:9176: \$? = $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:9179: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:8688: \$? = $ac_status" >&5
-+ echo "$as_me:9182: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
- else
-@@ -8694,7 +9188,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
--#line 8697 "configure"
-+#line 9191 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include
-@@ -8715,16 +9209,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8718: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9212: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:8721: \$? = $ac_status" >&5
-+ echo "$as_me:9215: \$? = $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:9218: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:8727: \$? = $ac_status" >&5
-+ echo "$as_me:9221: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sys_large_files=1; break
- else
-@@ -8735,7 +9229,7 @@
- break
- done
- fi
--echo "$as_me:8738: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:9232: 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 +9242,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:9245: 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 +9250,7 @@
- while :; do
- ac_cv_sys_largefile_source=no
- cat >conftest.$ac_ext <<_ACEOF
--#line 8759 "configure"
-+#line 9253 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -8768,16 +9262,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8771: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9265: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:8774: \$? = $ac_status" >&5
-+ echo "$as_me:9268: \$? = $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:9271: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:8780: \$? = $ac_status" >&5
-+ echo "$as_me:9274: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
- else
-@@ -8786,7 +9280,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
--#line 8789 "configure"
-+#line 9283 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include
-@@ -8799,16 +9293,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8802: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9296: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:8805: \$? = $ac_status" >&5
-+ echo "$as_me:9299: \$? = $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:9302: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:8811: \$? = $ac_status" >&5
-+ echo "$as_me:9305: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sys_largefile_source=1; break
- else
-@@ -8819,7 +9313,7 @@
- break
- done
- fi
--echo "$as_me:8822: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:9316: 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 +9327,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:9330: 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 9336 "configure"
- #include "confdefs.h"
- #include
- int
-@@ -8851,16 +9345,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8854: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9348: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:8857: \$? = $ac_status" >&5
-+ echo "$as_me:9351: \$? = $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:9354: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:8863: \$? = $ac_status" >&5
-+ echo "$as_me:9357: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_fseeko=yes
- else
-@@ -8870,7 +9364,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:9367: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
-
-@@ -8891,14 +9385,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:9388: 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 9395 "configure"
- #include "confdefs.h"
-
- #include
-@@ -8919,16 +9413,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8922: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9416: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:8925: \$? = $ac_status" >&5
-+ echo "$as_me:9419: \$? = $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:9422: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:8931: \$? = $ac_status" >&5
-+ echo "$as_me:9425: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_struct_dirent64=yes
- else
-@@ -8939,16 +9433,17 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
-
- fi
--echo "$as_me:8942: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:9436: result: $cf_cv_struct_dirent64" >&5
- echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
-- test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
-+ test "$cf_cv_struct_dirent64" = yes &&
-+cat >>confdefs.h <<\EOF
- #define HAVE_STRUCT_DIRENT64 1
- EOF
-
- fi
-
- ### Enable compiling-in rcs id's
--echo "$as_me:8951: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:9446: 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,16 +9453,17 @@
- else
- with_rcs_ids=no
- fi;
--echo "$as_me:8961: result: $with_rcs_ids" >&5
-+echo "$as_me:9456: result: $with_rcs_ids" >&5
- echo "${ECHO_T}$with_rcs_ids" >&6
--test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF
-+test "$with_rcs_ids" = yes &&
-+cat >>confdefs.h <<\EOF
- #define USE_RCS_IDS 1
- EOF
-
- ###############################################################################
-
- ### 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:9466: 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,15 +9473,16 @@
- else
- with_ext_funcs=yes
- fi;
--echo "$as_me:8980: result: $with_ext_funcs" >&5
-+echo "$as_me:9476: result: $with_ext_funcs" >&5
- echo "${ECHO_T}$with_ext_funcs" >&6
- if test "$with_ext_funcs" = yes ; then
- NCURSES_EXT_FUNCS=1
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_USE_DEFAULT_COLORS 1
- EOF
-
-- cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\EOF
- #define NCURSES_EXT_FUNCS 1
- EOF
-
-@@ -8994,7 +9491,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:9494: 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 +9501,7 @@
- else
- with_ext_const=no
- fi;
--echo "$as_me:9007: result: $with_ext_const" >&5
-+echo "$as_me:9504: result: $with_ext_const" >&5
- echo "${ECHO_T}$with_ext_const" >&6
- NCURSES_CONST='/*nothing*/'
- if test "$with_ext_const" = yes ; then
-@@ -9014,7 +9511,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
-
--echo "$as_me:9017: checking if you want all development code" >&5
-+echo "$as_me:9514: 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 +9521,7 @@
- else
- with_develop=no
- fi;
--echo "$as_me:9027: result: $with_develop" >&5
-+echo "$as_me:9524: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
-
- ###############################################################################
-@@ -9033,7 +9530,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:9533: 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 +9540,27 @@
- else
- with_pthread=no
- fi;
--echo "$as_me:9046: result: $with_pthread" >&5
-+echo "$as_me:9543: 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:9547: 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 9553 "configure"
- #include "confdefs.h"
- #include
- _ACEOF
--if { (eval echo "$as_me:9060: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:9557: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$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:9563: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -9082,20 +9579,38 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:9085: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:9582: 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
-
-- cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\EOF
- #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:9592: 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"
-+
-+cf_add_libs="-l$cf_lib_pthread"
-+# Filter out duplicates - this happens with badly-designed ".pc" files...
-+for cf_add_1lib in $LIBS
-+do
-+ for cf_add_2lib in $cf_add_libs
-+ do
-+ if test "x$cf_add_1lib" = "x$cf_add_2lib"
-+ then
-+ cf_add_1lib=
-+ break
-+ fi
-+ done
-+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+done
-+LIBS="$cf_add_libs"
-+
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 9613 "configure"
- #include "confdefs.h"
-
- #include
-@@ -9104,23 +9619,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:9630: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:9117: \$? = $ac_status" >&5
-+ echo "$as_me:9633: \$? = $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:9636: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:9123: \$? = $ac_status" >&5
-+ echo "$as_me:9639: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- with_pthread=yes
- else
-@@ -9129,27 +9645,45 @@
- 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:9649: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
-+ test "$with_pthread" = yes && break
-+ done
-+
-+ if test "$with_pthread" = yes ; then
-+
-+cf_add_libs="-l$cf_lib_pthread"
-+# Filter out duplicates - this happens with badly-designed ".pc" files...
-+for cf_add_1lib in $LIBS
-+do
-+ for cf_add_2lib in $cf_add_libs
-+ do
-+ if test "x$cf_add_1lib" = "x$cf_add_2lib"
-+ then
-+ cf_add_1lib=
-+ break
-+ fi
-+ done
-+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+done
-+LIBS="$cf_add_libs"
-
-- if test "$with_pthread" = yes ; then
-- LIBS="-lpthread $LIBS"
-- cat >>confdefs.h <<\EOF
-+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:9677: 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:9686: 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 +9693,18 @@
- else
- use_weak_symbols=no
- fi;
--echo "$as_me:9162: result: $use_weak_symbols" >&5
-+echo "$as_me:9696: 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:9700: 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 9707 "configure"
- #include "confdefs.h"
-
- #include
-@@ -9196,16 +9730,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9199: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9733: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:9202: \$? = $ac_status" >&5
-+ echo "$as_me:9736: \$? = $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:9739: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:9208: \$? = $ac_status" >&5
-+ echo "$as_me:9742: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_weak_symbols=yes
- else
-@@ -9216,7 +9750,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
-
- fi
--echo "$as_me:9219: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:9753: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
-
- else
-@@ -9224,7 +9758,8 @@
- fi
-
- if test $cf_cv_weak_symbols = yes ; then
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define USE_WEAK_SYMBOLS 1
- EOF
-
-@@ -9232,7 +9767,8 @@
-
- PTHREAD=
- if test "$with_pthread" = "yes" ; then
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define USE_PTHREADS 1
- EOF
-
-@@ -9243,13 +9779,13 @@
- fi
-
- # OpenSUSE is installing ncurses6, using reentrant option.
--echo "$as_me:9246: checking for _nc_TABSIZE" >&5
-+echo "$as_me:9782: 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 9788 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char _nc_TABSIZE (); below. */
-@@ -9272,7 +9808,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 +9816,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9283: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9819: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:9286: \$? = $ac_status" >&5
-+ echo "$as_me:9822: \$? = $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:9825: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:9292: \$? = $ac_status" >&5
-+ echo "$as_me:9828: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func__nc_TABSIZE=yes
- else
-@@ -9299,7 +9835,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:9838: 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 +9847,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:9850: 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 +9857,7 @@
- else
- with_reentrant=$assume_reentrant
- fi;
--echo "$as_me:9324: result: $with_reentrant" >&5
-+echo "$as_me:9860: result: $with_reentrant" >&5
- echo "${ECHO_T}$with_reentrant" >&6
- if test "$with_reentrant" = yes ; then
- cf_cv_enable_reentrant=1
-@@ -9333,7 +9869,8 @@
- elif test "$assume_reentrant" = no ; then
- LIB_SUFFIX="t${LIB_SUFFIX}"
- fi
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define USE_REENTRANT 1
- EOF
-
-@@ -9343,7 +9880,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:9883: 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 +9890,7 @@
- else
- NCURSES_WRAP_PREFIX=_nc_
- fi;
-- echo "$as_me:9356: result: $NCURSES_WRAP_PREFIX" >&5
-+ echo "$as_me:9893: result: $NCURSES_WRAP_PREFIX" >&5
- echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
- else
- NCURSES_WRAP_PREFIX=_nc_
-@@ -9366,26 +9903,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:9907: 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:9941: 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:9945: 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 +9950,7 @@
- enableval="$enable_warnings"
- with_warnings=$enableval
- fi;
--echo "$as_me:9396: result: $with_warnings" >&5
-+echo "$as_me:9953: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
-
- if test "x$with_warnings" = "xyes"; then
-@@ -9405,12 +9962,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:9965: 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 9970 "configure"
- #include "confdefs.h"
-
- int
-@@ -9427,19 +9984,19 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9430: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9987: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:9433: \$? = $ac_status" >&5
-+ echo "$as_me:9990: \$? = $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:9993: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:9439: \$? = $ac_status" >&5
-+ echo "$as_me:9996: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- INTEL_COMPILER=yes
--cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-+cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-
- else
- echo "$as_me: failed program was:" >&5
-@@ -9447,14 +10004,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:10007: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- ;;
- esac
- fi
-
-+CLANG_COMPILER=no
-+
-+if test "$GCC" = yes ; then
-+ echo "$as_me:10016: 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 10021 "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:10038: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:10041: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:10044: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:10047: \$? = $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:10058: result: $CLANG_COMPILER" >&5
-+echo "${ECHO_T}$CLANG_COMPILER" >&6
-+fi
-+
- cat > conftest.$ac_ext <&5
-+ { echo "$as_me:10080: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- cf_save_CFLAGS="$CFLAGS"
- EXTRA_CFLAGS="-Wall"
-@@ -9487,12 +10093,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:10096: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:9493: \$? = $ac_status" >&5
-+ echo "$as_me:10099: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- test -n "$verbose" && echo "$as_me:9495: result: ... -$cf_opt" >&5
-+ test -n "$verbose" && echo "$as_me:10101: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- fi
-@@ -9501,16 +10107,20 @@
-
- elif test "$GCC" = yes
- then
-- { echo "$as_me:9504: checking for $CC warning options..." >&5
-+ { echo "$as_me:10110: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- cf_save_CFLAGS="$CFLAGS"
- EXTRA_CFLAGS=
- cf_warn_CONST=""
- test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
-+ cf_gcc_warnings="Wignored-qualifiers Wlogical-op Wvarargs"
-+ test "x$CLANG_COMPILER" = xyes && cf_gcc_warnings=
- for cf_opt in W Wall \
- Wbad-function-cast \
- Wcast-align \
- Wcast-qual \
-+ Wdeclaration-after-statement \
-+ Wextra \
- Winline \
- Wmissing-declarations \
- Wmissing-prototypes \
-@@ -9518,15 +10128,15 @@
- Wpointer-arith \
- Wshadow \
- Wstrict-prototypes \
-- Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
-+ Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
- do
- CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-- if { (eval echo "$as_me:9524: \"$ac_compile\"") >&5
-+ if { (eval echo "$as_me:10134: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:9527: \$? = $ac_status" >&5
-+ echo "$as_me:10137: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- test -n "$verbose" && echo "$as_me:9529: result: ... -$cf_opt" >&5
-+ test -n "$verbose" && echo "$as_me:10139: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- case $cf_opt in #(vi
- Wcast-qual) #(vi
-@@ -9537,7 +10147,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}:10150: 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}:10160: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-
- continue;;
- esac
-@@ -9570,10 +10190,10 @@
- EOF
- if test "$GCC" = yes
- then
-- { echo "$as_me:9573: checking for $CC __attribute__ directives..." >&5
-+ { echo "$as_me:10193: 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:10245: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:9628: \$? = $ac_status" >&5
-+ echo "$as_me:10248: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- test -n "$verbose" && echo "$as_me:9630: result: ... $cf_attribute" >&5
-+ test -n "$verbose" && echo "$as_me:10250: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- cat conftest.h >>confdefs.h
- case $cf_attribute in #(vi
-- printf) #(vi
-- if test "$cf_printf_attribute" = no ; then
-- cat >>confdefs.h <>confdefs.h <>confdefs.h <>confdefs.h <<\EOF
-+#define GCC_PRINTF 1
- EOF
-+
- fi
-+
-+cat >>confdefs.h <>confdefs.h <>confdefs.h <>confdefs.h <<\EOF
-+#define GCC_SCANF 1
- EOF
-+
- fi
-+
-+cat >>confdefs.h <>confdefs.h <&5
-+echo "$as_me:10310: 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 +10317,12 @@
- else
- with_assertions=no
- fi;
--echo "$as_me:9676: result: $with_assertions" >&5
-+echo "$as_me:10320: 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
-
-@@ -9692,6 +10332,7 @@
- fi
-
- ### use option --disable-leaks to suppress "permanent" leaks, for testing
-+
- cat >>confdefs.h <<\EOF
- #define HAVE_NC_ALLOC_H 1
- EOF
-@@ -9701,7 +10342,8 @@
- # Check whether --enable-expanded or --disable-expanded was given.
- if test "${enable_expanded+set}" = set; then
- enableval="$enable_expanded"
-- test "$enableval" = yes && cat >>confdefs.h <<\EOF
-+ test "$enableval" = yes &&
-+cat >>confdefs.h <<\EOF
- #define NCURSES_EXPANDED 1
- EOF
-
-@@ -9712,7 +10354,8 @@
- # Check whether --enable-macros or --disable-macros was given.
- if test "${enable_macros+set}" = set; then
- enableval="$enable_macros"
-- test "$enableval" = no && cat >>confdefs.h <<\EOF
-+ test "$enableval" = no &&
-+cat >>confdefs.h <<\EOF
- #define NCURSES_NOMACROS 1
- EOF
-
-@@ -9727,7 +10370,7 @@
- ;;
- esac
-
--echo "$as_me:9730: checking whether to add trace feature to all models" >&5
-+echo "$as_me:10373: 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 +10380,7 @@
- else
- cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:9740: result: $cf_with_trace" >&5
-+echo "$as_me:10383: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
-
- if test "$cf_with_trace" = yes ; then
-@@ -9758,7 +10401,7 @@
- -D*)
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
-
-- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=yes
-
-@@ -9799,7 +10442,7 @@
-
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
-
-- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=no
- ;;
-@@ -9825,18 +10468,38 @@
- ADA_TRACE=FALSE
- fi
-
-+echo "$as_me:10471: checking if we want to use GNAT projects" >&5
-+echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
-+
-+# Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-+if test "${enable_gnat_projects+set}" = set; then
-+ enableval="$enable_gnat_projects"
-+ test "$enableval" != no && enableval=yes
-+ if test "$enableval" != "yes" ; then
-+ enable_gnat_projects=no
-+ else
-+ enable_gnat_projects=yes
-+ fi
-+else
-+ enableval=yes
-+ enable_gnat_projects=yes
-+
-+fi;
-+echo "$as_me:10488: result: $enable_gnat_projects" >&5
-+echo "${ECHO_T}$enable_gnat_projects" >&6
-+
- ### Checks for libraries.
- case $cf_cv_system_name in #(vi
- *mingw32*) #(vi
- ;;
- *)
--echo "$as_me:9833: checking for gettimeofday" >&5
-+echo "$as_me:10496: 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 10502 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gettimeofday (); below. */
-@@ -9859,7 +10522,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 +10530,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9870: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10533: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:9873: \$? = $ac_status" >&5
-+ echo "$as_me:10536: \$? = $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:10539: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:9879: \$? = $ac_status" >&5
-+ echo "$as_me:10542: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_gettimeofday=yes
- else
-@@ -9886,7 +10549,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:10552: 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 +10558,7 @@
-
- else
-
--echo "$as_me:9898: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:10561: 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 +10566,7 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9906 "configure"
-+#line 10569 "configure"
- #include "confdefs.h"
-
- /* Override any gcc2 internal prototype to avoid an error. */
-@@ -9922,16 +10585,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9925: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10588: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:9928: \$? = $ac_status" >&5
-+ echo "$as_me:10591: \$? = $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:10594: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:9934: \$? = $ac_status" >&5
-+ echo "$as_me:10597: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -9942,10 +10605,11 @@
- 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:10608: 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
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_GETTIMEOFDAY 1
- EOF
-
-@@ -9957,13 +10621,13 @@
- esac
-
- ### Checks for header files.
--echo "$as_me:9960: checking for ANSI C header files" >&5
-+echo "$as_me:10624: 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 10630 "configure"
- #include "confdefs.h"
- #include
- #include
-@@ -9971,13 +10635,13 @@
- #include
-
- _ACEOF
--if { (eval echo "$as_me:9974: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:10638: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$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:10644: \$? = $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 +10663,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 10666 "configure"
- #include "confdefs.h"
- #include
-
-@@ -10017,7 +10681,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 10684 "configure"
- #include "confdefs.h"
- #include
-
-@@ -10038,7 +10702,7 @@
- :
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line 10041 "configure"
-+#line 10705 "configure"
- #include "confdefs.h"
- #include
- #if ((' ' & 0x0FF) == 0x020)
-@@ -10064,15 +10728,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:10067: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10731: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:10070: \$? = $ac_status" >&5
-+ echo "$as_me:10734: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:10072: \"$ac_try\"") >&5
-+ { (eval echo "$as_me:10736: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:10075: \$? = $ac_status" >&5
-+ echo "$as_me:10739: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
- else
-@@ -10085,7 +10749,7 @@
- fi
- fi
- fi
--echo "$as_me:10088: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:10752: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
-
-@@ -10098,13 +10762,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:10765: 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 10771 "configure"
- #include "confdefs.h"
- #include
- #include <$ac_hdr>
-@@ -10119,16 +10783,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10122: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10786: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:10125: \$? = $ac_status" >&5
-+ echo "$as_me:10789: \$? = $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:10792: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:10131: \$? = $ac_status" >&5
-+ echo "$as_me:10795: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_Header=yes"
- else
-@@ -10138,7 +10802,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:10805: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <&5
-+ echo "$as_me:10818: 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 +10823,7 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10162 "configure"
-+#line 10826 "configure"
- #include "confdefs.h"
-
- /* Override any gcc2 internal prototype to avoid an error. */
-@@ -10178,16 +10842,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10181: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10845: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:10184: \$? = $ac_status" >&5
-+ echo "$as_me:10848: \$? = $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:10851: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:10190: \$? = $ac_status" >&5
-+ echo "$as_me:10854: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dir_opendir=yes
- else
-@@ -10198,14 +10862,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:10865: 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:10872: 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 +10877,7 @@
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10216 "configure"
-+#line 10880 "configure"
- #include "confdefs.h"
-
- /* Override any gcc2 internal prototype to avoid an error. */
-@@ -10232,191 +10896,100 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10235: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10899: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:10238: \$? = $ac_status" >&5
-+ echo "$as_me:10902: \$? = $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:10905: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:10244: \$? = $ac_status" >&5
-+ echo "$as_me:10908: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_x_opendir=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_lib_x_opendir=no
--fi
--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 "${ECHO_T}$ac_cv_lib_x_opendir" >&6
--if test $ac_cv_lib_x_opendir = yes; then
-- LIBS="$LIBS -lx"
--fi
--
--fi
--
--echo "$as_me:10263: 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"
--#include "confdefs.h"
--#include
--#include
--#include
--
--int
--main ()
--{
--if ((struct tm *) 0)
--return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10285: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-- ac_status=$?
-- echo "$as_me:10288: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:10291: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:10294: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_header_time=yes
--else
-- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_header_time=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:10304: result: $ac_cv_header_time" >&5
--echo "${ECHO_T}$ac_cv_header_time" >&6
--if test $ac_cv_header_time = yes; then
--
--cat >>confdefs.h <<\EOF
--#define TIME_WITH_SYS_TIME 1
--EOF
--
--fi
--
--### checks for compiler characteristics
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--ac_main_return=return
--
--echo "$as_me:10322: 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
--else
-- ac_cv_prog_cc_stdc=no
--ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
--#line 10330 "configure"
--#include "confdefs.h"
--#include
--#include
--#include
--#include
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
-- char **p;
-- int i;
--{
-- return p[i];
--}
--static char *f (char * (*g) (char **, int), char **p, ...)
--{
-- char *s;
-- va_list v;
-- va_start (v,p);
-- s = g (p, va_arg (v,int));
-- va_end (v);
-- return s;
--}
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
-+cat conftest.$ac_ext >&5
-+ac_cv_lib_x_opendir=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:10919: 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"
-+fi
-+
-+fi
-+
-+echo "$as_me:10927: 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 10933 "configure"
-+#include "confdefs.h"
-+#include
-+#include
-+#include
-+
- int
- main ()
- {
--return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
-+if ((struct tm *) 0)
-+return 0;
- ;
- return 0;
- }
- _ACEOF
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX -qlanglvl=ansi
--# Ultrix and OSF/1 -std1
--# HP-UX 10.20 and later -Ae
--# HP-UX older versions -Aa -D_HPUX_SOURCE
--# SVR4 -Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
-- CC="$ac_save_CC $ac_arg"
-- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10379: \"$ac_compile\"") >&5
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:10949: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:10382: \$? = $ac_status" >&5
-+ echo "$as_me:10952: \$? = $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:10955: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:10388: \$? = $ac_status" >&5
-+ echo "$as_me:10958: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_prog_cc_stdc=$ac_arg
--break
-+ ac_cv_header_time=yes
- else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-+ac_cv_header_time=no
- fi
--rm -f conftest.$ac_objext
--done
--rm -f conftest.$ac_ext conftest.$ac_objext
--CC=$ac_save_CC
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:10968: result: $ac_cv_header_time" >&5
-+echo "${ECHO_T}$ac_cv_header_time" >&6
-+if test $ac_cv_header_time = yes; then
-+
-+cat >>confdefs.h <<\EOF
-+#define TIME_WITH_SYS_TIME 1
-+EOF
-
- fi
-
--case "x$ac_cv_prog_cc_stdc" in
-- x|xno)
-- echo "$as_me:10405: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6 ;;
-- *)
-- echo "$as_me:10408: result: $ac_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-- CC="$CC $ac_cv_prog_cc_stdc" ;;
--esac
-+### checks for compiler characteristics
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+ac_main_return=return
-
--echo "$as_me:10413: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:10986: 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 10992 "configure"
- #include "confdefs.h"
-
- int
-@@ -10474,16 +11047,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10477: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11050: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:10480: \$? = $ac_status" >&5
-+ echo "$as_me:11053: \$? = $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:11056: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:10486: \$? = $ac_status" >&5
-+ echo "$as_me:11059: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_c_const=yes
- else
-@@ -10493,7 +11066,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10496: result: $ac_cv_c_const" >&5
-+echo "$as_me:11069: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
-
-@@ -10505,7 +11078,7 @@
-
- ### Checks for external-data
-
--echo "$as_me:10508: checking if data-only library module links" >&5
-+echo "$as_me:11081: 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 +11086,20 @@
-
- rm -f conftest.a
- cat >conftest.$ac_ext <&5
-+ if { (eval echo "$as_me:11092: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:10522: \$? = $ac_status" >&5
-+ echo "$as_me:11095: \$? = $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:11115: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-- echo "$as_me:10545: \$? = $ac_status" >&5
-+ echo "$as_me:11118: \$? = $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 +11128,7 @@
- cf_cv_link_dataonly=unknown
- else
- cat >conftest.$ac_ext <<_ACEOF
--#line 10558 "configure"
-+#line 11131 "configure"
- #include "confdefs.h"
-
- int main()
-@@ -10566,15 +11139,15 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:10569: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11142: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:10572: \$? = $ac_status" >&5
-+ echo "$as_me:11145: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:10574: \"$ac_try\"") >&5
-+ { (eval echo "$as_me:11147: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:10577: \$? = $ac_status" >&5
-+ echo "$as_me:11150: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_link_dataonly=yes
- else
-@@ -10589,11 +11162,12 @@
-
- fi
-
--echo "$as_me:10592: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:11165: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
-
- if test "$cf_cv_link_dataonly" = no ; then
-- cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define BROKEN_LINKER 1
- EOF
-
-@@ -10602,7 +11176,7 @@
-
- ### Checks for library functions.
-
--echo "$as_me:10605: checking for working mkstemp" >&5
-+echo "$as_me:11179: 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 +11184,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 11190 "configure"
- #include "confdefs.h"
-
- #include
-@@ -10709,15 +11225,15 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:10712: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11228: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:10715: \$? = $ac_status" >&5
-+ echo "$as_me:11231: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:10717: \"$ac_try\"") >&5
-+ { (eval echo "$as_me:11233: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:10720: \$? = $ac_status" >&5
-+ echo "$as_me:11236: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_func_mkstemp=yes
-
-@@ -10732,80 +11248,89 @@
- fi
-
- fi
--echo "$as_me:10735: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:11251: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
--if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
-- cat >>confdefs.h <<\EOF
--#define HAVE_MKSTEMP 1
--EOF
--
--fi
--
--echo "$as_me:10744: 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
-+if test "x$cf_cv_func_mkstemp" = xmaybe ; then
-+ echo "$as_me:11254: 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 10750 "configure"
-+#line 11260 "configure"
- #include "confdefs.h"
--#include
--#include
--#ifdef signal
--# undef signal
--#endif
-+/* 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" void (*signal (int, void (*)(int)))(int);
--#else
--void (*signal ()) ();
-+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 ()
- {
--int i;
-+/* 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
--if { (eval echo "$as_me:10772: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:11291: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
-- echo "$as_me:10775: \$? = $ac_status" >&5
-+ echo "$as_me:11294: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:10778: \"$ac_try\"") >&5
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:11297: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-- echo "$as_me:10781: \$? = $ac_status" >&5
-+ echo "$as_me:11300: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_type_signal=void
-+ ac_cv_func_mkstemp=yes
- else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--ac_cv_type_signal=int
-+ac_cv_func_mkstemp=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:10791: result: $ac_cv_type_signal" >&5
--echo "${ECHO_T}$ac_cv_type_signal" >&6
-+echo "$as_me:11310: result: $ac_cv_func_mkstemp" >&5
-+echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
-
--cat >>confdefs.h <>confdefs.h <<\EOF
-+#define HAVE_MKSTEMP 1
- EOF
-
-+fi
-+
- if test -z "$cf_user_CFLAGS" && test "$with_no_leaks" = no ; then
- CFLAGS=`echo ${CFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'`
- CXXFLAGS=`echo ${CXXFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'`
- fi
-
-+cf_with_ada=yes
- if test "$cf_with_ada" != "no" ; then
-
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:10808: checking for $ac_word" >&5
-+echo "$as_me:11333: 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 +11345,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:11348: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -10829,31 +11354,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:11357: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
-- echo "$as_me:10835: result: no" >&5
-+ echo "$as_me:11360: 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:11369: 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:11374: 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:11382: 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 +11387,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:11390: 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 +11402,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:11405: found $ac_dir/$ac_word" >&5
- break
- done
-
-@@ -10885,10 +11411,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:11414: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
-- echo "$as_me:10891: result: no" >&5
-+ echo "$as_me:11417: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-@@ -10897,7 +11423,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:11426: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
-
- rm -rf conftest* *~conftest*
-@@ -10925,30 +11451,48 @@
- fi
- rm -rf conftest* *~conftest*
-
-- echo "$as_me:10928: result: $cf_cv_prog_gnat_correct" >&5
-+ echo "$as_me:11454: 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:11461: 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:11478: result: $ADAFLAGS" >&5
-+echo "${ECHO_T}$ADAFLAGS" >&6
-+
-+echo "$as_me:11481: checking if GNATPREP supports -T option" >&5
-+echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
-+if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+cf_cv_gnatprep_opt_t=no
-+gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
-
--echo "$as_me:10951: checking if GNAT supports generics" >&5
-+fi
-+echo "$as_me:11491: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
-+test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
-+
-+echo "$as_me:11495: 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 +11502,7 @@
- cf_gnat_generics=no
- ;;
- esac
--echo "$as_me:10961: result: $cf_gnat_generics" >&5
-+echo "$as_me:11505: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
-
- if test "$cf_gnat_generics" = yes
-@@ -10970,7 +11514,7 @@
- cf_generic_objects=
- fi
-
--echo "$as_me:10973: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:11517: 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 +11562,7 @@
- rm -rf conftest* *~conftest*
-
- fi
--echo "$as_me:11021: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:11565: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
-
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -11027,58 +11571,18 @@
- USE_GNAT_SIGINT="#"
- fi
-
--echo "$as_me:11030: 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
--else
--
--rm -rf conftest* *~conftest*
--cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then
-- cf_cv_pragma_unreferenced=yes
--else
-- cf_cv_pragma_unreferenced=no
--fi
--rm -rf conftest* *~conftest*
--
--fi
--echo "$as_me:11061: 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).
--if test $cf_cv_pragma_unreferenced = yes ; then
-- PRAGMA_UNREF=TRUE
--else
-- PRAGMA_UNREF=FALSE
--fi
--
- cf_gnat_libraries=no
- cf_gnat_projects=no
-
--echo "$as_me:11074: checking if GNAT supports project files" >&5
-+if test "$enable_gnat_projects" != no ; then
-+echo "$as_me:11578: 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
- ;;
- *)
- case $cf_cv_system_name in #(vi
-- cygwin*) #(vi
-+ cygwin*|msys*) #(vi
- ;;
- *)
- mkdir conftest.src conftest.bin conftest.lib
-@@ -11095,14 +11599,6 @@
- for Library_Dir use External("BUILD_DIR");
- Source_Dir := External ("SOURCE_DIR");
- for Source_Dirs use (Source_Dir);
-- package Compiler is
-- for Default_Switches ("Ada") use
-- ("-g",
-- "-O2",
-- "-gnatafno",
-- "-gnatVa", -- All validity checks
-- "-gnatwa"); -- Activate all optional errors
-- end Compiler;
- end Library;
- CF_EOF
- cat >>confpackage.ads <&5
-+echo "$as_me:11638: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
-+fi # enable_gnat_projects
-
- if test $cf_gnat_projects = yes
- then
-- echo "$as_me:11147: checking if GNAT supports libraries" >&5
-+ echo "$as_me:11644: 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:11646: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
-
-@@ -11166,7 +11663,7 @@
- USE_GNAT_LIBRARIES="#"
- fi
-
--echo "$as_me:11169: checking for ada-compiler" >&5
-+echo "$as_me:11666: 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 +11674,12 @@
- cf_ada_compiler=gnatmake
- fi;
-
--echo "$as_me:11180: result: $cf_ada_compiler" >&5
-+echo "$as_me:11677: 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:11682: 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 +11703,7 @@
- ;;
- .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
- ;;
--.\${*prefix}*) #(vi
-+.\${*prefix}*|.\${*dir}*) #(vi
- eval withval="$withval"
- case ".$withval" in #(vi
- .NONE/*)
-@@ -11218,19 +11715,19 @@
- withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- ;;
- *)
-- { { echo "$as_me:11221: error: expected a pathname, not \"$withval\"" >&5
-+ { { echo "$as_me:11718: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
-
- fi
--ADA_INCLUDE="$withval"
-+eval ADA_INCLUDE="$withval"
-
--echo "$as_me:11230: result: $ADA_INCLUDE" >&5
-+echo "$as_me:11727: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
-
--echo "$as_me:11233: checking for ada-objects" >&5
-+echo "$as_me:11730: 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 +11751,7 @@
- ;;
- .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
- ;;
--.\${*prefix}*) #(vi
-+.\${*prefix}*|.\${*dir}*) #(vi
- eval withval="$withval"
- case ".$withval" in #(vi
- .NONE/*)
-@@ -11266,19 +11763,19 @@
- withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- ;;
- *)
-- { { echo "$as_me:11269: error: expected a pathname, not \"$withval\"" >&5
-+ { { echo "$as_me:11766: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
-
- fi
--ADA_OBJECTS="$withval"
-+eval ADA_OBJECTS="$withval"
-
--echo "$as_me:11278: result: $ADA_OBJECTS" >&5
-+echo "$as_me:11775: 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:11778: 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 +11785,7 @@
- else
- with_ada_sharedlib=no
- fi;
--echo "$as_me:11291: result: $with_ada_sharedlib" >&5
-+echo "$as_me:11788: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
-
- ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -11304,12 +11801,12 @@
- fi
-
- else
-- { { echo "$as_me:11307: error: No usable Ada compiler found" >&5
-+ { { echo "$as_me:11804: 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:11809: 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,25 +11814,20 @@
- ################################################################################
-
- # not needed
--TINFO_ARGS2=
-+TINFO_LDFLAGS2=
-+
-+TINFO_LIBS=
-
- ### Construct the list of include-directories to be generated
-
--CPPFLAGS="$CPPFLAGS -I. -I../include"
- if test "$srcdir" != "."; then
-- CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
-+ CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
- fi
--if test "$GCC" != yes; then
-- CPPFLAGS="$CPPFLAGS -I\${includedir}"
--elif test "$includedir" != "/usr/include"; then
-- if test "$includedir" = '${prefix}/include' ; then
-- if test $prefix != /usr ; then
-- CPPFLAGS="$CPPFLAGS -I\${includedir}"
-- fi
-- else
-- CPPFLAGS="$CPPFLAGS -I\${includedir}"
-- fi
-+CPPFLAGS="-I../include $CPPFLAGS"
-+if test "$srcdir" != "."; then
-+ CPPFLAGS="-I\${srcdir} $CPPFLAGS"
- fi
-+CPPFLAGS="-I. $CPPFLAGS"
-
- ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS"
- if test "$srcdir" != "."; then
-@@ -11345,7 +11837,7 @@
- ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
- elif test "$includedir" != "/usr/include"; then
- if test "$includedir" = '${prefix}/include' ; then
-- if test $prefix != /usr ; then
-+ if test x$prefix != x/usr ; then
- ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
- fi
- else
-@@ -11354,7 +11846,7 @@
- fi
-
- ### Build up pieces for makefile rules
--echo "$as_me:11357: checking default library suffix" >&5
-+echo "$as_me:11849: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
-
- case $DFT_LWR_MODEL in
-@@ -11365,36 +11857,32 @@
- 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:11860: 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:11863: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
-
-- case $DFT_LWR_MODEL in #(vi
-- libtool) #(vi
-+ case X$DFT_LWR_MODEL in #(vi
-+ Xlibtool) #(vi
- DFT_LIB_SUFFIX='.la'
- DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
- ;;
-- normal) #(vi
-- DFT_LIB_SUFFIX='.a'
-- DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
-- ;;
-- debug) #(vi
-+ Xdebug) #(vi
- DFT_LIB_SUFFIX='_g.a'
- DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
- ;;
-- profile) #(vi
-+ Xprofile) #(vi
- DFT_LIB_SUFFIX='_p.a'
- DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
- ;;
-- shared) #(vi
-+ Xshared) #(vi
- case $cf_cv_system_name in
-- aix[56]*) #(vi
-- DFT_LIB_SUFFIX='.a'
-+ aix[5-7]*) #(vi
-+ DFT_LIB_SUFFIX='.so'
- DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
- ;;
-- cygwin*) #(vi
-+ cygwin*|msys*|mingw*) #(vi
- DFT_LIB_SUFFIX='.dll'
- DFT_DEP_SUFFIX='.dll.a'
- ;;
-@@ -11414,17 +11902,23 @@
- ;;
- esac
- ;;
-- *) DFT_LIB_SUFFIX='.so'
-+ *) #(vi
-+ DFT_LIB_SUFFIX='.so'
- DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
- ;;
- esac
-+ ;;
-+ *)
-+ DFT_LIB_SUFFIX='.a'
-+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
-+ ;;
- 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:11918: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
-
--echo "$as_me:11427: checking default object directory" >&5
-+echo "$as_me:11921: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
-
- case $DFT_LWR_MODEL in
-@@ -11434,13 +11928,13 @@
- profile) DFT_OBJ_SUBDIR='obj_p' ;;
- shared)
- case $cf_cv_system_name in #(vi
-- cygwin) #(vi
-+ cygwin|msys) #(vi
- DFT_OBJ_SUBDIR='objects' ;;
- *)
- DFT_OBJ_SUBDIR='obj_s' ;;
- esac
- esac
--echo "$as_me:11443: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:11937: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
-
- ### Set up low-level terminfo dependencies for makefiles.
-@@ -11450,6 +11944,9 @@
- cygwin*)
- # "lib" files have ".dll.a" suffix, "cyg" files have ".dll"
- ;;
-+ msys*)
-+ # "lib" files have ".dll.a" suffix, "msys-" files have ".dll"
-+ ;;
- esac
- fi
-
-@@ -11479,7 +11976,7 @@
- -D*)
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
-
-- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=yes
-
-@@ -11520,7 +12017,7 @@
-
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
-
-- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=no
- ;;
-@@ -11544,15 +12041,6 @@
-
- ################################################################################
-
--if test x"$enable_pc_files" = xyes ; then \
--SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
--MAKE_PC_FILES=
--else
--MAKE_PC_FILES="#"
--fi
--
--################################################################################
--
- TEST_ARG2=
-
- TEST_LIBS2=
-@@ -11656,7 +12144,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:12147: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -11788,7 +12276,7 @@
- cat >>$CONFIG_STATUS <&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -11851,7 +12339,7 @@
- ac_need_defaults=false;;
-
- # This is an error.
-- -*) { { echo "$as_me:11854: error: unrecognized option: $1
-+ -*) { { echo "$as_me:12342: 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 +12358,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.20141204, executed with
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
- CONFIG_LINKS = $CONFIG_LINKS
-@@ -11892,8 +12380,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 +12410,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:12413: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
- esac
-@@ -11981,6 +12469,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
-@@ -12024,9 +12513,8 @@
- s,@ac_ct_CC@,$ac_ct_CC,;t t
- s,@EXEEXT@,$EXEEXT,;t t
- s,@OBJEXT@,$OBJEXT,;t t
--s,@CPP@,$CPP,;t t
- s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t
--s,@PROG_EXT@,$PROG_EXT,;t t
-+s,@CPP@,$CPP,;t t
- s,@AWK@,$AWK,;t t
- s,@EGREP@,$EGREP,;t t
- s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-@@ -12061,6 +12549,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
-@@ -12073,33 +12562,41 @@
- s,@LIB_SUFFIX@,$LIB_SUFFIX,;t t
- s,@CC_G_OPT@,$CC_G_OPT,;t t
- s,@LD_MODEL@,$LD_MODEL,;t t
-+s,@shlibdir@,$shlibdir,;t t
-+s,@MAKE_DLLS@,$MAKE_DLLS,;t t
- s,@CC_SHARED_OPTS@,$CC_SHARED_OPTS,;t t
- s,@LD_RPATH_OPT@,$LD_RPATH_OPT,;t t
- s,@LD_SHARED_OPTS@,$LD_SHARED_OPTS,;t t
- s,@MK_SHARED_LIB@,$MK_SHARED_LIB,;t t
-+s,@RM_SHARED_OPTS@,$RM_SHARED_OPTS,;t t
- s,@LINK_PROGS@,$LINK_PROGS,;t t
- s,@LINK_TESTS@,$LINK_TESTS,;t t
- s,@EXTRA_LDFLAGS@,$EXTRA_LDFLAGS,;t t
- 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
- s,@gnat_exists@,$gnat_exists,;t t
- s,@M4_exists@,$M4_exists,;t t
- s,@cf_ada_make@,$cf_ada_make,;t t
-+s,@GNATPREP_OPTS@,$GNATPREP_OPTS,;t t
- s,@cf_compile_generics@,$cf_compile_generics,;t t
- s,@cf_generic_objects@,$cf_generic_objects,;t t
- s,@USE_GNAT_SIGINT@,$USE_GNAT_SIGINT,;t t
--s,@PRAGMA_UNREF@,$PRAGMA_UNREF,;t t
- s,@USE_OLD_MAKERULES@,$USE_OLD_MAKERULES,;t t
- s,@USE_GNAT_PROJECTS@,$USE_GNAT_PROJECTS,;t t
- s,@USE_GNAT_LIBRARIES@,$USE_GNAT_LIBRARIES,;t t
-@@ -12109,13 +12606,12 @@
- 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
- s,@DFT_OBJ_SUBDIR@,$DFT_OBJ_SUBDIR,;t t
--s,@MAKE_PC_FILES@,$MAKE_PC_FILES,;t t
--s,@cross_compiling@,$cross_compiling,;t t
- s,@TEST_ARG2@,$TEST_ARG2,;t t
- s,@TEST_LIBS2@,$TEST_LIBS2,;t t
- s,@NCURSES_SHLIB2@,$NCURSES_SHLIB2,;t t
-@@ -12237,7 +12733,7 @@
- esac
-
- if test x"$ac_file" != x-; then
-- { echo "$as_me:12240: creating $ac_file" >&5
-+ { echo "$as_me:12736: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
-@@ -12255,7 +12751,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:12754: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- echo $f;;
-@@ -12268,13 +12764,45 @@
- echo $srcdir/$f
- else
- # /dev/null tree
-- { { echo "$as_me:12271: error: cannot find input file: $f" >&5
-+ { { echo "$as_me:12767: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- fi;;
- esac
- done` || { (exit 1); exit 1; }
- EOF
-+cat >>$CONFIG_STATUS <<\EOF
-+ ac_warn_datarootdir=no
-+ if test x"$ac_file" != x-; then
-+ for ac_item in $ac_file_inputs
-+ do
-+ ac_seen=`grep '@\(datadir\|mandir\|infodir\)@' $ac_item`
-+ if test -n "$ac_seen"; then
-+ ac_used=`grep '@datarootdir@' $ac_item`
-+ if test -z "$ac_used"; then
-+ { echo "$as_me:12783: WARNING: datarootdir was used implicitly but not set:
-+$ac_seen" >&5
-+echo "$as_me: WARNING: datarootdir was used implicitly but not set:
-+$ac_seen" >&2;}
-+ ac_warn_datarootdir=yes
-+ fi
-+ fi
-+ ac_seen=`grep '${datarootdir}' $ac_item`
-+ if test -n "$ac_seen"; then
-+ { echo "$as_me:12792: WARNING: datarootdir was used explicitly but not set:
-+$ac_seen" >&5
-+echo "$as_me: WARNING: datarootdir was used explicitly but not set:
-+$ac_seen" >&2;}
-+ ac_warn_datarootdir=yes
-+ fi
-+ done
-+ fi
-+
-+if test "x$ac_warn_datarootdir" = xyes; then
-+ ac_sed_cmds="$ac_sed_cmds | sed -e 's,@datarootdir@,\${prefix}/share,g' -e 's,\${datarootdir},\${prefix}/share,g'"
-+fi
-+
-+EOF
- cat >>$CONFIG_STATUS <$tmp/out
- rm -f $tmp/stdin
- if test x"$ac_file" != x-; then
-- mv $tmp/out $ac_file
-+ cp $tmp/out $ac_file
-+
-+ for ac_name in prefix exec_prefix datarootdir
-+ do
-+ ac_seen=`fgrep -n '${'$ac_name'[:=].*}' $ac_file`
-+ if test -n "$ac_seen"; then
-+ ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file`
-+ if test -z "$ac_init"; then
-+ ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
-+ { echo "$as_me:12829: WARNING: Variable $ac_name is used but was not set:
-+$ac_seen" >&5
-+echo "$as_me: WARNING: Variable $ac_name is used but was not set:
-+$ac_seen" >&2;}
-+ fi
-+ fi
-+ done
-+ egrep -n '@[a-z_][a-z_0-9]+@' $ac_file >$tmp/out
-+ egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-+ if test -s $tmp/out; then
-+ ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
-+ { echo "$as_me:12840: WARNING: Some variables may not be substituted:
-+$ac_seen" >&5
-+echo "$as_me: WARNING: Some variables may not be substituted:
-+$ac_seen" >&2;}
-+ fi
- else
- cat $tmp/out
-- rm -f $tmp/out
- fi
-+ rm -f $tmp/out
-
- done
- EOF
-@@ -12334,7 +12886,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:12889: 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 +12897,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:12900: 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 +12910,7 @@
- echo $srcdir/$f
- else
- # /dev/null tree
-- { { echo "$as_me:12361: error: cannot find input file: $f" >&5
-+ { { echo "$as_me:12913: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- fi;;
-@@ -12416,7 +12968,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:12971: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
- else
- ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-Index: Ada95/configure.in
-Prereq: 1.30
---- ncurses-5.9/Ada95/configure.in 2011-03-31 22:49:22.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/configure.in 2014-08-02 20:29:22.000000000 +0000
-@@ -1,5 +1,5 @@
- dnl***************************************************************************
--dnl Copyright (c) 2010,2011 Free Software Foundation, Inc. *
-+dnl Copyright (c) 2010-2013,2014 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,24 +28,20 @@
- 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.56 2014/08/02 20:29:22 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_PREREQ(2.52.20030208)
-+AC_REVISION($Revision: 1.56 $)
- AC_INIT(gen/gen.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
-
- CF_TOP_BUILDDIR
-
--CF_CHECK_CACHE([AC_CANONICAL_SYSTEM])
--AC_ARG_WITH(system-type,
--[ --with-system-type=XXX test: override derived host system-type],
--[AC_MSG_WARN(overriding system type to $withval)
-- cf_cv_system_name=$withval])
-+CF_WITH_SYSTYPE
-
- ### Save the given $CFLAGS to allow user-override.
- cf_user_CFLAGS="$CFLAGS"
-@@ -54,15 +50,10 @@
- CF_CFG_DEFAULTS
-
- ### Checks for programs.
--AC_PROG_CC
--CF_GCC_VERSION
--
-+CF_PROG_CC(gnatgcc gcc cc)
- AC_PROG_CPP
- AC_PROG_GCC_TRADITIONAL
- CF_PROG_CC_C_O(CC)
--AC_ISC_POSIX
--CF_ANSI_CC_REQD
--CF_PROG_EXT
-
- AC_ARG_PROGRAM
-
-@@ -75,28 +66,7 @@
-
- # 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
-
- AC_MSG_CHECKING(if you want to build test-programs)
- AC_ARG_WITH(tests,
-@@ -130,6 +100,7 @@
- AC_CHECK_TOOL(LD, ld, ld)
- AC_CHECK_TOOL(AR, ar, ar)
- CF_AR_FLAGS
-+CF_PATHSEP
-
- dnl Special option for use by system-builders: the install-prefix is used to
- dnl adjust the location into which the actual install is done, so that an
-@@ -186,9 +157,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 +204,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,
-@@ -272,7 +239,7 @@
- [with_rcs_ids=$withval],
- [with_rcs_ids=no])
- AC_MSG_RESULT($with_rcs_ids)
--test "$with_rcs_ids" = yes && AC_DEFINE(USE_RCS_IDS)
-+test "$with_rcs_ids" = yes && AC_DEFINE(USE_RCS_IDS,1,[Define to 1 if RCS identifiers should be compiled-in)])
-
- ###############################################################################
- CF_HELP_MESSAGE(Extensions:)
-@@ -286,8 +253,8 @@
- AC_MSG_RESULT($with_ext_funcs)
- if test "$with_ext_funcs" = yes ; then
- NCURSES_EXT_FUNCS=1
-- AC_DEFINE(HAVE_USE_DEFAULT_COLORS)
-- AC_DEFINE(NCURSES_EXT_FUNCS)
-+ AC_DEFINE(HAVE_USE_DEFAULT_COLORS,1,[Define to 1 if we have use_default_colors function])
-+ AC_DEFINE(NCURSES_EXT_FUNCS,1,[Define to 1 if we have ncurses extended functions])
- else
- NCURSES_EXT_FUNCS=0
- fi
-@@ -337,12 +304,12 @@
- fi
-
- if test $cf_cv_weak_symbols = yes ; then
-- AC_DEFINE(USE_WEAK_SYMBOLS)
-+ AC_DEFINE(USE_WEAK_SYMBOLS,1,[Define to 1 to enable weak-symbols for pthreads])
- fi
-
- PTHREAD=
- if test "$with_pthread" = "yes" ; then
-- AC_DEFINE(USE_PTHREADS)
-+ AC_DEFINE(USE_PTHREADS,1,[Define to 1 to use the pthreads library])
- enable_reentrant=yes
- if test $cf_cv_weak_symbols = yes ; then
- PTHREAD=-lpthread
-@@ -370,7 +337,7 @@
- elif test "$assume_reentrant" = no ; then
- LIB_SUFFIX="t${LIB_SUFFIX}"
- fi
-- AC_DEFINE(USE_REENTRANT)
-+ AC_DEFINE(USE_REENTRANT,1,[Define to 1 to compile with experimental reentrant code])
- else
- cf_cv_enable_reentrant=0
- fi
-@@ -388,24 +355,13 @@
- NCURSES_WRAP_PREFIX=_nc_
- fi
- AC_SUBST(NCURSES_WRAP_PREFIX)
--AC_DEFINE_UNQUOTED(NCURSES_WRAP_PREFIX,"$NCURSES_WRAP_PREFIX")
-+AC_DEFINE_UNQUOTED(NCURSES_WRAP_PREFIX,"$NCURSES_WRAP_PREFIX",[Define to override _nc_ ncurses internal prefix])
-
- ###############################################################################
- 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)
-@@ -416,7 +372,7 @@
-
- if test "x$with_warnings" = "xyes"; then
- CF_ADD_ADAFLAGS(-gnatg)
-- CF_GCC_WARNINGS(Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum)
-+ CF_GCC_WARNINGS(Wno-unknown-pragmas Wswitch-enum)
- fi
- CF_GCC_ATTRIBUTES
-
-@@ -431,7 +387,6 @@
- then
- if test "$with_assertions" = no
- then
-- AC_DEFINE(NDEBUG)
- CPPFLAGS="$CPPFLAGS -DNDEBUG"
- else
- CF_ADD_ADAFLAGS(-gnata)
-@@ -439,17 +394,17 @@
- fi
-
- ### use option --disable-leaks to suppress "permanent" leaks, for testing
--AC_DEFINE(HAVE_NC_ALLOC_H)
-+AC_DEFINE(HAVE_NC_ALLOC_H,1,[Define to 1 if we have nc_alloc.h header])
-
- ### use option --enable-expanded to generate certain macros as functions
- AC_ARG_ENABLE(expanded,
- [ --enable-expanded test: generate functions for certain macros],
-- [test "$enableval" = yes && AC_DEFINE(NCURSES_EXPANDED)])
-+ [test "$enableval" = yes && AC_DEFINE(NCURSES_EXPANDED,1,[Define to 1 if ncurses macros should be expanded as functions])])
-
- ### use option --disable-macros to suppress macros in favor of functions
- AC_ARG_ENABLE(macros,
- [ --disable-macros test: use functions rather than macros],
-- [test "$enableval" = no && AC_DEFINE(NCURSES_NOMACROS)])
-+ [test "$enableval" = no && AC_DEFINE(NCURSES_NOMACROS,1,[Define to 1 if ncurses macros should be expanded as functions])])
-
- # Normally we only add trace() to the debug-library. Allow this to be
- # extended to all models of the ncurses library:
-@@ -476,6 +431,8 @@
-
- AC_SUBST(ADA_TRACE)
-
-+CF_DISABLE_GNAT_PROJECTS
-+
- ### Checks for libraries.
- case $cf_cv_system_name in #(vi
- *mingw32*) #(vi
-@@ -485,7 +442,7 @@
- AC_DEFINE(HAVE_GETTIMEOFDAY),[
-
- AC_CHECK_LIB(bsd, gettimeofday,
-- AC_DEFINE(HAVE_GETTIMEOFDAY)
-+ AC_DEFINE(HAVE_GETTIMEOFDAY,1,[Define to 1 if we have gettimeofday])
- LIBS="$LIBS -lbsd")])dnl CLIX: bzero, select, gettimeofday
- ;;
- esac
-@@ -505,8 +462,6 @@
- ### Checks for library functions.
- CF_MKSTEMP
-
--AC_TYPE_SIGNAL
--
- dnl We'll do our own -g libraries, unless the user's overridden via $CFLAGS
- if test -z "$cf_user_CFLAGS" && test "$with_no_leaks" = no ; then
- CF_STRIP_G_OPT(CFLAGS)
-@@ -514,28 +469,18 @@
- 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
-+ CF_FIXUP_ADAFLAGS
-
-- # make ADAFLAGS consistent with CFLAGS
-- case "$CFLAGS" in
-- *-g*)
-- CF_ADD_ADAFLAGS(-g)
-- ;;
-- esac
-- case "$CFLAGS" in
-- *-O*)
-- CF_ADD_ADAFLAGS(-O3)
-- ;;
-- esac
-+ CF_GNATPREP_OPT_T
-
- CF_GNAT_GENERICS
- CF_GNAT_SIGINT
-- CF_GNAT_PRAGMA_UNREF
- CF_GNAT_PROJECTS
-
- CF_WITH_ADA_COMPILER
-@@ -556,8 +501,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
-@@ -586,6 +533,9 @@
- cygwin*)
- # "lib" files have ".dll.a" suffix, "cyg" files have ".dll"
- ;;
-+ msys*)
-+ # "lib" files have ".dll.a" suffix, "msys-" files have ".dll"
-+ ;;
- esac
- fi
-
-@@ -594,24 +544,13 @@
-
- SUB_MAKEFILES="gen/adacurses${DFT_ARG_SUFFIX}-config:gen/adacurses-config.in"
-
--AC_DEFINE_UNQUOTED(NCURSES_PATHSEP,'$PATH_SEPARATOR')
-+AC_DEFINE_UNQUOTED(NCURSES_PATHSEP,'$PATH_SEPARATOR',[Define to override ':' as the library path-separator])
-
- ### Now that we're done running tests, add the compiler-warnings, if any
- CF_ADD_CFLAGS($EXTRA_CFLAGS)
-
- ################################################################################
-
--if test x"$enable_pc_files" = xyes ; then \
--SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
--MAKE_PC_FILES=
--else
--MAKE_PC_FILES="#"
--fi
--AC_SUBST(MAKE_PC_FILES)
--AC_SUBST(cross_compiling)
--
--################################################################################
--
- TEST_ARG2=
- AC_SUBST(TEST_ARG2)
-
-@@ -656,8 +595,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"
-Index: Ada95/doc/Makefile.in
-Prereq: 1.2
---- ncurses-5.9/Ada95/doc/Makefile.in 2011-03-26 19:26:17.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/doc/Makefile.in 2012-08-11 21:31:56.000000000 +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@
-
-Index: Ada95/gen/Makefile.in
-Prereq: 1.74
---- ncurses-5.9/Ada95/gen/Makefile.in 2011-03-26 23:36:30.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/gen/Makefile.in 2014-05-31 23:38:17.000000000 +0000
-@@ -1,5 +1,5 @@
- ##############################################################################
--# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. #
-+# Copyright (c) 1998-2012,2014 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.81 2014/05/31 23:38:17 tom Exp $
- #
- .SUFFIXES:
-
-@@ -36,7 +36,7 @@
- VPATH = @srcdir@
- THIS = Makefile
-
--x = @PROG_EXT@
-+x = @EXEEXT@
-
- top_srcdir = @top_srcdir@
- DESTDIR = @DESTDIR@
-@@ -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@
-
-@@ -97,39 +97,6 @@
-
- ADA_SRCDIR = ../src
-
--GEN_FILES0 = Base_Defs
--
--GEN_FILES1 = ACS_Map \
-- AC_Rep \
-- Base_Defs \
-- Character_Attribute_Set_Rep \
-- Color_Defs \
-- Key_Definitions \
-- Linker_Options \
-- Old_Keys \
-- Public_Variables \
-- Trace_Defs \
-- Version_Info \
-- Window_Offsets
--
--GEN_FILES2 = Menu_Opt_Rep \
-- Menu_Base_Defs \
-- Menu_Linker_Options \
-- Item_Rep
--
--GEN_FILES3 = Form_Opt_Rep \
-- Form_Base_Defs \
-- Form_Linker_Options \
-- Field_Rep
--
--GEN_FILES4 = Mouse_Base_Defs \
-- Mouse_Event_Rep \
-- Mouse_Events \
-- Panel_Linker_Options
--
--GEN_FILES5 = Chtype_Def \
-- Eti_Defs
--
- GEN_TARGETS = $(ADA_SRCDIR)/$(ABASE).ads \
- $(ADA_SRCDIR)/$(ABASE).adb \
- $(ADA_SRCDIR)/$(ABASE)-aux.ads \
-@@ -143,7 +110,8 @@
- $(ADA_SRCDIR)/$(ABASE)-forms-form_user_data.ads \
- $(ADA_SRCDIR)/$(ABASE)-forms-field_types.ads \
- $(ADA_SRCDIR)/$(ABASE)-forms-field_user_data.ads \
-- $(ADA_SRCDIR)/$(ABASE)-panels-user_data.ads
-+ $(ADA_SRCDIR)/$(ABASE)-panels-user_data.ads \
-+ $(ADA_SRCDIR)/$(ABASE)_constants.ads
-
- GEN_SRC = $(srcdir)/$(ABASE).ads.m4 \
- $(srcdir)/$(ABASE).adb.m4 \
-@@ -179,133 +147,57 @@
- -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
--################################################################################
--Character_Attribute_Set_Rep: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) B A" >$@
--
--Base_Defs: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) B B" >$@
--
--Color_Defs: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) B C" >$@
--
--Window_Offsets: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) B D" >$@
--
--Key_Definitions: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) B K" >$@
--
--Linker_Options: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) B L" >$@
--
--ACS_Map: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) B M" >$@
--
--Old_Keys: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) B O" >$@
--
--Public_Variables: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) B P" >$@
--
--AC_Rep: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) B R" >$@
--
--Version_Info: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) B V" >$@
--
--Trace_Defs: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) B T" >$@
--################################################################################
--Menu_Opt_Rep: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) M R" >$@
--
--Menu_Base_Defs: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) M B" >$@
--
--Menu_Linker_Options: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) M L" >$@
--
--Item_Rep: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) M I" >$@
--################################################################################
--Form_Opt_Rep: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) F R" >$@
--
--Form_Base_Defs: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) F B" >$@
--
--Form_Linker_Options: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) F L" >$@
--
--Field_Rep: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) F I" >$@
--################################################################################
--Mouse_Base_Defs: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) P B" >$@
--
--Mouse_Event_Rep: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) P M" >$@
--
--Mouse_Events: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) B E" >$@
--
--Panel_Linker_Options: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) P L" >$@
--
--Chtype_Def: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) E C" >$@
-
--Eti_Defs: $(PROG_GENERATE)
-- $(WRAPPER) "$(GENERATE) E E" >$@
-+$(ADA_SRCDIR)/$(ABASE)_constants.ads: $(PROG_GENERATE)
-+ $(WRAPPER) "$(GENERATE)" >$@
- ################################################################################
- $(ADA_SRCDIR)/$(ABASE).ads: $(srcdir)/$(ABASE).ads.m4 \
-- $(GEN_FILES1) $(srcdir)/normal.m4
-+ $(srcdir)/normal.m4
- $(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
- $(srcdir)/$(ABASE).ads.m4 |\
- $(DEL_ADAMODE) >$@
-
- $(ADA_SRCDIR)/$(ABASE).adb: $(srcdir)/$(ABASE).adb.m4 \
-- $(GEN_FILES1) $(srcdir)/normal.m4
-+ $(srcdir)/normal.m4
- $(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
- $(srcdir)/$(ABASE).adb.m4 |\
- $(DEL_ADAMODE) >$@
-
- $(ADA_SRCDIR)/$(ABASE)-aux.ads: $(srcdir)/$(ABASE)-aux.ads.m4 \
-- $(GEN_FILES5) $(srcdir)/normal.m4
-+ $(srcdir)/normal.m4
- $(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
- $(srcdir)/$(ABASE)-aux.ads.m4 |\
- $(DEL_ADAMODE) >$@
-
- $(ADA_SRCDIR)/$(ABASE)-trace.ads: $(srcdir)/$(ABASE)-trace.ads.m4 \
-- $(GEN_FILES5) $(srcdir)/normal.m4
-+ $(srcdir)/normal.m4
- $(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
- $(srcdir)/$(ABASE)-trace.ads.m4 |\
- $(DEL_ADAMODE) >$@
-
- $(ADA_SRCDIR)/$(ABASE)-menus.ads: $(srcdir)/$(ABASE)-menus.ads.m4 \
-- $(GEN_FILES2) $(srcdir)/normal.m4
-+ $(srcdir)/normal.m4
- $(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
- $(srcdir)/$(ABASE)-menus.ads.m4 |\
- $(DEL_ADAMODE) >$@
-
- $(ADA_SRCDIR)/$(ABASE)-forms.ads: $(srcdir)/$(ABASE)-forms.ads.m4 \
-- $(GEN_FILES3) $(srcdir)/normal.m4
-+ $(srcdir)/normal.m4
- $(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
- $(srcdir)/$(ABASE)-forms.ads.m4 |\
- $(DEL_ADAMODE) >$@
-
- $(ADA_SRCDIR)/$(ABASE)-mouse.ads: $(srcdir)/$(ABASE)-mouse.ads.m4 \
-- $(GEN_FILES4) $(srcdir)/normal.m4
-+ $(srcdir)/normal.m4
- $(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
- $(srcdir)/$(ABASE)-mouse.ads.m4 |\
- $(DEL_ADAMODE) >$@
-
- $(ADA_SRCDIR)/$(ABASE)-panels.ads: $(srcdir)/$(ABASE)-panels.ads.m4 \
-- $(GEN_FILES4) \
- $(srcdir)/normal.m4
- $(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
- $(srcdir)/$(ABASE)-panels.ads.m4 |\
-@@ -363,11 +255,6 @@
-
- mostlyclean ::
- -rm -f a.out core $(PROG_GENERATE) *.o
-- -rm -f $(GEN_FILES1)
-- -rm -f $(GEN_FILES2)
-- -rm -f $(GEN_FILES3)
-- -rm -f $(GEN_FILES4)
-- -rm -f $(GEN_FILES5)
-
- clean :: mostlyclean
- -rm -f $(GEN_TARGETS) instab.tmp *.ad[bs] *.html *.ali *.tmp
-@@ -411,7 +298,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` ;\
-Index: Ada95/gen/adacurses-config.in
-Prereq: 1.6
---- ncurses-5.9/Ada95/gen/adacurses-config.in 2010-03-06 21:05:01.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/gen/adacurses-config.in 2014-06-07 19:32:22.000000000 +0000
-@@ -1,7 +1,7 @@
- #! /bin/sh
--# $Id: adacurses-config.in,v 1.6 2010/03/06 21:05:01 tom Exp $
-+# $Id: adacurses-config.in,v 1.9 2014/06/07 19:32:22 Pascal.Pignard Exp $
- ##############################################################################
--# Copyright (c) 2007-2009,2010 Free Software Foundation, Inc. #
-+# Copyright (c) 2007-2010,2014 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"), #
-@@ -40,7 +40,7 @@
-
- VERSION=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@
-
--CFLAGS="-I$ADA_INCLUDE -aO$ADA_OBJECTS"
-+CFLAGS="-aI$ADA_INCLUDE -aO$ADA_OBJECTS"
- LIBS="-L$ADA_OBJECTS -lAdaCurses"
-
- THIS="adacurses"
-@@ -57,19 +57,21 @@
- ;;
- x)
- # if no parameter is given, give what gnatmake needs
-- echo "$CFLAGS -i -largs $LIBS"
-+ echo "$CFLAGS -largs $LIBS"
- ;;
- x--help)
- cat <
- #else
- #include
--#define HAVE_USE_DEFAULT_COLORS 1
- #endif
-
- #include
--#include
- #include
--#include
--#include
-
- #include
- #include
-
--#define UChar(c) ((unsigned char)(c))
--#define RES_NAME "Reserved"
--
--static const char *model = "";
--static int little_endian = 0;
--
--typedef struct
-- {
-- const char *name;
-- unsigned long attr;
-- }
--name_attribute_pair;
--
--static int
--find_pos(char *s, unsigned len, int *low, int *high)
--{
-- unsigned int i, j;
-- int l = 0;
-+#undef UCHAR
-+#undef UINT
-
-- *high = -1;
-- *low = (int)(8 * len);
-+typedef unsigned char UCHAR;
-+typedef unsigned int UINT;
-
-- for (i = 0; i < len; i++, s++)
-- {
-- if (*s)
-- {
-- for (j = 0; j < 8 * sizeof(char); j++)
--
-- {
-- if (((little_endian && ((*s) & 0x01)) ||
-- (!little_endian && ((*s) & 0x80))))
-- {
-- if (l > *high)
-- *high = l;
-- if (l < *low)
-- *low = l;
-- }
-- l++;
-- if (little_endian)
-- {
-- *s >>= 1;
-- }
-- else
-- {
-- *s = (char)(*s << 1);
-- }
-- }
-- }
-- else
-- l += 8;
-- }
-- return (*high >= 0 && (*low <= *high)) ? *low : -1;
--}
-+/* These global variables will be set by main () */
-+static int little_endian;
-+static const char *my_program_invocation_name = NULL;
-
--/*
-- * This helper routine generates a representation clause for a
-- * record type defined in the binding.
-- * We are only dealing with record types which are of 32 or 16
-- * bit size, i.e. they fit into an (u)int or a (u)short.
-- */
- static void
--gen_reps(
-- const name_attribute_pair * nap, /* array of name_attribute_pair records */
-- const char *name, /* name of the represented record type */
-- int len, /* size of the record in bytes */
-- int bias)
-+my_error(const char *message)
- {
-- 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;
-- 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;
-- }
-- assert(width > 0);
--
-- printf(" type %s is\n", name);
-- 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);
--
-- printf(" for %s use\n", name);
-- printf(" record\n");
--
-- for (i = 0; nap[i].name != (char *)0; i++)
-- {
-- a = nap[i].attr;
-- l = find_pos((char *)&a, sizeof(a), &low, &high);
-- if (l >= 0)
-- 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(" for %s'Size use %d;\n", name, len_bits);
-- printf(" -- Please note: this rep. clause is generated and may be\n");
-- printf(" -- different on your system.");
-+ fprintf(stderr, "%s: %s\n", my_program_invocation_name, message);
-+ exit(EXIT_FAILURE);
- }
-
- static void
--chtype_rep(const char *name, attr_t mask)
-+print_constant(const char *name,
-+ long value)
- {
-- attr_t x = (attr_t)-1;
-- attr_t t = x & mask;
-- int low, high;
-- int l = find_pos((char *)&t, sizeof(t), &low, &high);
--
-- if (l >= 0)
-- printf(" %-5s at 0 range %2d .. %2d;\n", name, low, high);
-+ printf(" %-28s : constant := %ld;\n", name, value);
- }
-
--static void
--gen_chtype_rep(const char *name)
--{
-- printf(" for %s use\n record\n", name);
-- chtype_rep("Ch", A_CHARTEXT);
-- chtype_rep("Color", A_COLOR);
-- chtype_rep("Attr", (A_ATTRIBUTES & ~A_COLOR));
-- printf(" end record;\n for %s'Size use %ld;\n",
-- name, (long)(8 * sizeof(chtype)));
--
-- printf(" -- Please note: this rep. clause is generated and may be\n");
-- printf(" -- different on your system.\n");
--}
-+#define PRINT_NAMED_CONSTANT(name) \
-+ print_constant (#name, name)
-
- static void
--mrep_rep(const char *name, void *rec)
-+print_comment(const char *message)
- {
-- int low, high;
-- int l = find_pos((char *)rec, sizeof(MEVENT), &low, &high);
--
-- if (l >= 0)
-- printf(" %-7s at 0 range %3d .. %3d;\n", name, low, high);
-+ printf("\n -- %s\n\n", message);
- }
-
--static void
--gen_mrep_rep(const char *name)
--{
-- MEVENT x;
--
-- printf(" for %s use\n record\n", name);
--
-- memset(&x, 0, sizeof(x));
-- x.id = -1;
-- mrep_rep("Id", &x);
--
-- memset(&x, 0, sizeof(x));
-- x.x = -1;
-- mrep_rep("X", &x);
--
-- memset(&x, 0, sizeof(x));
-- x.y = -1;
-- mrep_rep("Y", &x);
--
-- memset(&x, 0, sizeof(x));
-- x.z = -1;
-- mrep_rep("Z", &x);
--
-- memset(&x, 0, sizeof(x));
-- x.bstate = (mmask_t) - 1;
-- mrep_rep("Bstate", &x);
--
-- printf(" end record;\n");
-- printf(" -- Please note: this rep. clause is generated and may be\n");
-- printf(" -- different on your system.\n");
--}
--
--static void
--gen_attr_set(const char *name)
--{
-- /* All of the A_xxx symbols are defined in ncurses, but not all are nonzero
-- * if "configure --enable-widec" is not specified. Originally (in
-- * 1999-2000), the ifdef's also were needed since the proposed bit-layout
-- * for wide characters allocated 16-bits for A_CHARTEXT, leaving too few
-- * bits for a few of the A_xxx symbols.
-- */
-- static const name_attribute_pair nap[] =
-- {
--#if A_STANDOUT
-- {"Stand_Out", A_STANDOUT},
--#endif
--#if A_UNDERLINE
-- {"Under_Line", A_UNDERLINE},
--#endif
--#if A_REVERSE
-- {"Reverse_Video", A_REVERSE},
--#endif
--#if A_BLINK
-- {"Blink", A_BLINK},
--#endif
--#if A_DIM
-- {"Dim_Character", A_DIM},
--#endif
--#if A_BOLD
-- {"Bold_Character", A_BOLD},
--#endif
--#if A_ALTCHARSET
-- {"Alternate_Character_Set", A_ALTCHARSET},
--#endif
--#if A_INVIS
-- {"Invisible_Character", A_INVIS},
--#endif
--#if A_PROTECT
-- {"Protected_Character", A_PROTECT},
--#endif
--#if A_HORIZONTAL
-- {"Horizontal", A_HORIZONTAL},
--#endif
--#if A_LEFT
-- {"Left", A_LEFT},
--#endif
--#if A_LOW
-- {"Low", A_LOW},
--#endif
--#if A_RIGHT
-- {"Right", A_RIGHT},
--#endif
--#if A_TOP
-- {"Top", A_TOP},
--#endif
--#if A_VERTICAL
-- {"Vertical", A_VERTICAL},
--#endif
-- {(char *)0, 0}
-- };
-- chtype attr = A_ATTRIBUTES & ~A_COLOR;
-- int start = -1;
-- int len = 0;
-- int i;
-- chtype set;
-- for (i = 0; i < (int)(8 * sizeof(chtype)); i++)
--
-- {
-- set = (attr & 1);
-- if (set)
-- {
-- if (start < 0)
-- start = i;
-- if (start >= 0)
-- {
-- len++;
-- }
-- }
-- attr = attr >> 1;
-- }
-- gen_reps(nap, name, (len + 7) / 8, little_endian ? start : 0);
--}
--
--static void
--gen_trace(const char *name)
--{
-- static const name_attribute_pair nap[] =
-- {
-- {"Times", TRACE_TIMES},
-- {"Tputs", TRACE_TPUTS},
-- {"Update", TRACE_UPDATE},
-- {"Cursor_Move", TRACE_MOVE},
-- {"Character_Output", TRACE_CHARPUT},
-- {"Calls", TRACE_CALLS},
-- {"Virtual_Puts", TRACE_VIRTPUT},
-- {"Input_Events", TRACE_IEVENT},
-- {"TTY_State", TRACE_BITS},
-- {"Internal_Calls", TRACE_ICALLS},
-- {"Character_Calls", TRACE_CCALLS},
-- {"Termcap_TermInfo", TRACE_DATABASE},
-- {"Attributes_And_Colors", TRACE_ATTRS},
-- {(char *)0, 0}
-- };
-- gen_reps(nap, name, sizeof(int), 0);
--}
--
--static void
--gen_menu_opt_rep(const char *name)
--{
-- static const name_attribute_pair nap[] =
-- {
--#ifdef O_ONEVALUE
-- {"One_Valued", O_ONEVALUE},
--#endif
--#ifdef O_SHOWDESC
-- {"Show_Descriptions", O_SHOWDESC},
--#endif
--#ifdef O_ROWMAJOR
-- {"Row_Major_Order", O_ROWMAJOR},
--#endif
--#ifdef O_IGNORECASE
-- {"Ignore_Case", O_IGNORECASE},
--#endif
--#ifdef O_SHOWMATCH
-- {"Show_Matches", O_SHOWMATCH},
-+/*
-+ * Make sure that KEY_MIN and KEY_MAX are defined.
-+ * main () will protest if KEY_MIN == 256
-+ */
-+#ifndef KEY_MAX
-+# define KEY_MAX 0777
- #endif
--#ifdef O_NONCYCLIC
-- {"Non_Cyclic", O_NONCYCLIC},
-+#ifndef KEY_MIN
-+# define KEY_MIN 0401
- #endif
-- {(char *)0, 0}
-- };
-- gen_reps(nap, name, sizeof(int), 0);
--}
-
--static void
--gen_item_opt_rep(const char *name)
--{
-- static const name_attribute_pair nap[] =
-- {
--#ifdef O_SELECTABLE
-- {"Selectable", O_SELECTABLE},
--#endif
-- {(char *)0, 0}
-- };
-- gen_reps(nap, name, sizeof(int), 0);
-+static UCHAR
-+bit_is_set(const UCHAR * const data,
-+ const UINT offset)
-+{
-+ const UCHAR byte = data[offset >> 3];
-+ UINT bit;
-+
-+ if (little_endian)
-+ bit = offset; /* offset */
-+ else /* or */
-+ bit = ~offset; /* 7 - offset */
-+ bit &= 7; /* modulo 8 */
-+ return byte & (UCHAR) (1 << bit);
- }
-
--static void
--gen_form_opt_rep(const char *name)
-+/* Find lowest and highest used offset in a byte array. */
-+/* Returns 0 if and only if all bits are unset. */
-+static int
-+find_pos(const UCHAR * const data,
-+ const UINT sizeof_data,
-+ UINT * const low,
-+ UINT * const high)
- {
-- static const name_attribute_pair nap[] =
-- {
--#ifdef O_NL_OVERLOAD
-- {"NL_Overload", O_NL_OVERLOAD},
--#endif
--#ifdef O_BS_OVERLOAD
-- {"BS_Overload", O_BS_OVERLOAD},
--#endif
-- {(char *)0, 0}
-- };
-- gen_reps(nap, name, sizeof(int), 0);
--}
-+ const UINT last = (sizeof_data << 3) - 1;
-+ UINT offset;
-
--/*
-- * Generate the representation clause for the Field_Option_Set record
-- */
--static void
--gen_field_opt_rep(const char *name)
--{
-- static const name_attribute_pair nap[] =
-- {
--#ifdef O_VISIBLE
-- {"Visible", O_VISIBLE},
--#endif
--#ifdef O_ACTIVE
-- {"Active", O_ACTIVE},
--#endif
--#ifdef O_PUBLIC
-- {"Public", O_PUBLIC},
--#endif
--#ifdef O_EDIT
-- {"Edit", O_EDIT},
--#endif
--#ifdef O_WRAP
-- {"Wrap", O_WRAP},
--#endif
--#ifdef O_BLANK
-- {"Blank", O_BLANK},
--#endif
--#ifdef O_AUTOSKIP
-- {"Auto_Skip", O_AUTOSKIP},
--#endif
--#ifdef O_NULLOK
-- {"Null_Ok", O_NULLOK},
--#endif
--#ifdef O_PASSOK
-- {"Pass_Ok", O_PASSOK},
--#endif
--#ifdef O_STATIC
-- {"Static", O_STATIC},
--#endif
-- {(char *)0, 0}
-- };
-- gen_reps(nap, name, sizeof(int), 0);
--}
-+ for (offset = last; !bit_is_set(data, offset); offset--)
-+ if (!offset) /* All bits are 0. */
-+ return 0;
-+ *high = offset;
-
--/*
-- * Generate a single key code constant definition.
-- */
--static void
--keydef(const char *name, const char *old_name, int value, int mode)
--{
-- if (mode == 0) /* Generate the new name */
-- printf(" %-30s : constant Special_Key_Code := 8#%3o#;\n", name, value);
-- else
-+ for (offset = 0; !bit_is_set(data, offset); offset++)
- {
-- const char *s = old_name;
-- const char *t = name;
--
-- /* generate the old name, but only if it doesn't conflict with the old
-- * name (Ada95 isn't case sensitive!)
-- */
-- while (*s && *t && (toupper(UChar(*s++)) == toupper(UChar(*t++))));
-- if (*s || *t)
-- printf(" %-16s : Special_Key_Code renames %s;\n", old_name, name);
- }
-+ *low = offset;
-+
-+ return -1;
- }
-
--/*
-- * Generate constants for the key codes. When called with mode==0, a
-- * complete list with nice constant names in proper casing style will
-- * be generated. Otherwise a list of old (i.e. C-style) names will be
-- * generated, given that the name wasn't already defined in the "nice"
-- * list.
-- */
--static void
--gen_keydefs(int mode)
--{
-- char buf[16];
-- char obuf[16];
-- int i;
-+#define PRINT_BITMASK(c_type, ada_name, mask_macro) \
-+ { \
-+ UINT first, last; \
-+ c_type mask = (mask_macro); \
-+ if (!find_pos ((UCHAR *)&mask, sizeof (mask), &first, &last)) \
-+ my_error ("failed to locate " ada_name); \
-+ print_constant (ada_name "_First", first); \
-+ print_constant (ada_name "_Last", last); \
-+ }
-
--#ifdef KEY_CODE_YES
-- keydef("Key_Code_Yes", "KEY_CODE_YES", KEY_CODE_YES, mode);
--#endif
--#ifdef KEY_MIN
-- keydef("Key_Min", "KEY_MIN", KEY_MIN, mode);
--#endif
--#ifdef KEY_BREAK
-- keydef("Key_Break", "KEY_BREAK", KEY_BREAK, mode);
--#endif
--#ifdef KEY_DOWN
-- keydef("Key_Cursor_Down", "KEY_DOWN", KEY_DOWN, mode);
--#endif
--#ifdef KEY_UP
-- keydef("Key_Cursor_Up", "KEY_UP", KEY_UP, mode);
--#endif
--#ifdef KEY_LEFT
-- keydef("Key_Cursor_Left", "KEY_LEFT", KEY_LEFT, mode);
--#endif
--#ifdef KEY_RIGHT
-- keydef("Key_Cursor_Right", "KEY_RIGHT", KEY_RIGHT, mode);
--#endif
--#ifdef KEY_HOME
-- keydef("Key_Home", "KEY_HOME", KEY_HOME, mode);
--#endif
--#ifdef KEY_BACKSPACE
-- keydef("Key_Backspace", "KEY_BACKSPACE", KEY_BACKSPACE, mode);
--#endif
--#ifdef KEY_F0
-- keydef("Key_F0", "KEY_F0", KEY_F0, mode);
--#endif
--#ifdef KEY_F
-- for (i = 1; i <= 24; i++)
-- {
-- sprintf(buf, "Key_F%d", i);
-- sprintf(obuf, "KEY_F%d", i);
-- keydef(buf, obuf, KEY_F(i), mode);
-- }
--#endif
--#ifdef KEY_DL
-- keydef("Key_Delete_Line", "KEY_DL", KEY_DL, mode);
--#endif
--#ifdef KEY_IL
-- keydef("Key_Insert_Line", "KEY_IL", KEY_IL, mode);
--#endif
--#ifdef KEY_DC
-- keydef("Key_Delete_Char", "KEY_DC", KEY_DC, mode);
--#endif
--#ifdef KEY_IC
-- keydef("Key_Insert_Char", "KEY_IC", KEY_IC, mode);
--#endif
--#ifdef KEY_EIC
-- keydef("Key_Exit_Insert_Mode", "KEY_EIC", KEY_EIC, mode);
--#endif
--#ifdef KEY_CLEAR
-- keydef("Key_Clear_Screen", "KEY_CLEAR", KEY_CLEAR, mode);
--#endif
--#ifdef KEY_EOS
-- keydef("Key_Clear_End_Of_Screen", "KEY_EOS", KEY_EOS, mode);
--#endif
--#ifdef KEY_EOL
-- keydef("Key_Clear_End_Of_Line", "KEY_EOL", KEY_EOL, mode);
--#endif
--#ifdef KEY_SF
-- keydef("Key_Scroll_1_Forward", "KEY_SF", KEY_SF, mode);
--#endif
--#ifdef KEY_SR
-- keydef("Key_Scroll_1_Backward", "KEY_SR", KEY_SR, mode);
--#endif
--#ifdef KEY_NPAGE
-- keydef("Key_Next_Page", "KEY_NPAGE", KEY_NPAGE, mode);
--#endif
--#ifdef KEY_PPAGE
-- keydef("Key_Previous_Page", "KEY_PPAGE", KEY_PPAGE, mode);
--#endif
--#ifdef KEY_STAB
-- keydef("Key_Set_Tab", "KEY_STAB", KEY_STAB, mode);
--#endif
--#ifdef KEY_CTAB
-- keydef("Key_Clear_Tab", "KEY_CTAB", KEY_CTAB, mode);
--#endif
--#ifdef KEY_CATAB
-- keydef("Key_Clear_All_Tabs", "KEY_CATAB", KEY_CATAB, mode);
--#endif
--#ifdef KEY_ENTER
-- keydef("Key_Enter_Or_Send", "KEY_ENTER", KEY_ENTER, mode);
--#endif
--#ifdef KEY_SRESET
-- keydef("Key_Soft_Reset", "KEY_SRESET", KEY_SRESET, mode);
--#endif
--#ifdef KEY_RESET
-- keydef("Key_Reset", "KEY_RESET", KEY_RESET, mode);
--#endif
--#ifdef KEY_PRINT
-- keydef("Key_Print", "KEY_PRINT", KEY_PRINT, mode);
--#endif
--#ifdef KEY_LL
-- keydef("Key_Bottom", "KEY_LL", KEY_LL, mode);
--#endif
--#ifdef KEY_A1
-- keydef("Key_Upper_Left_Of_Keypad", "KEY_A1", KEY_A1, mode);
--#endif
--#ifdef KEY_A3
-- keydef("Key_Upper_Right_Of_Keypad", "KEY_A3", KEY_A3, mode);
--#endif
--#ifdef KEY_B2
-- keydef("Key_Center_Of_Keypad", "KEY_B2", KEY_B2, mode);
--#endif
--#ifdef KEY_C1
-- keydef("Key_Lower_Left_Of_Keypad", "KEY_C1", KEY_C1, mode);
--#endif
--#ifdef KEY_C3
-- keydef("Key_Lower_Right_Of_Keypad", "KEY_C3", KEY_C3, mode);
--#endif
--#ifdef KEY_BTAB
-- keydef("Key_Back_Tab", "KEY_BTAB", KEY_BTAB, mode);
--#endif
--#ifdef KEY_BEG
-- keydef("Key_Beginning", "KEY_BEG", KEY_BEG, mode);
--#endif
--#ifdef KEY_CANCEL
-- keydef("Key_Cancel", "KEY_CANCEL", KEY_CANCEL, mode);
--#endif
--#ifdef KEY_CLOSE
-- keydef("Key_Close", "KEY_CLOSE", KEY_CLOSE, mode);
--#endif
--#ifdef KEY_COMMAND
-- keydef("Key_Command", "KEY_COMMAND", KEY_COMMAND, mode);
--#endif
--#ifdef KEY_COPY
-- keydef("Key_Copy", "KEY_COPY", KEY_COPY, mode);
--#endif
--#ifdef KEY_CREATE
-- keydef("Key_Create", "KEY_CREATE", KEY_CREATE, mode);
--#endif
--#ifdef KEY_END
-- keydef("Key_End", "KEY_END", KEY_END, mode);
--#endif
--#ifdef KEY_EXIT
-- keydef("Key_Exit", "KEY_EXIT", KEY_EXIT, mode);
--#endif
--#ifdef KEY_FIND
-- keydef("Key_Find", "KEY_FIND", KEY_FIND, mode);
--#endif
--#ifdef KEY_HELP
-- keydef("Key_Help", "KEY_HELP", KEY_HELP, mode);
--#endif
--#ifdef KEY_MARK
-- keydef("Key_Mark", "KEY_MARK", KEY_MARK, mode);
--#endif
--#ifdef KEY_MESSAGE
-- keydef("Key_Message", "KEY_MESSAGE", KEY_MESSAGE, mode);
--#endif
--#ifdef KEY_MOVE
-- keydef("Key_Move", "KEY_MOVE", KEY_MOVE, mode);
--#endif
--#ifdef KEY_NEXT
-- keydef("Key_Next", "KEY_NEXT", KEY_NEXT, mode);
--#endif
--#ifdef KEY_OPEN
-- keydef("Key_Open", "KEY_OPEN", KEY_OPEN, mode);
--#endif
--#ifdef KEY_OPTIONS
-- keydef("Key_Options", "KEY_OPTIONS", KEY_OPTIONS, mode);
--#endif
--#ifdef KEY_PREVIOUS
-- keydef("Key_Previous", "KEY_PREVIOUS", KEY_PREVIOUS, mode);
--#endif
--#ifdef KEY_REDO
-- keydef("Key_Redo", "KEY_REDO", KEY_REDO, mode);
--#endif
--#ifdef KEY_REFERENCE
-- keydef("Key_Reference", "KEY_REFERENCE", KEY_REFERENCE, mode);
--#endif
--#ifdef KEY_REFRESH
-- keydef("Key_Refresh", "KEY_REFRESH", KEY_REFRESH, mode);
--#endif
--#ifdef KEY_REPLACE
-- keydef("Key_Replace", "KEY_REPLACE", KEY_REPLACE, mode);
--#endif
--#ifdef KEY_RESTART
-- keydef("Key_Restart", "KEY_RESTART", KEY_RESTART, mode);
--#endif
--#ifdef KEY_RESUME
-- keydef("Key_Resume", "KEY_RESUME", KEY_RESUME, mode);
--#endif
--#ifdef KEY_SAVE
-- keydef("Key_Save", "KEY_SAVE", KEY_SAVE, mode);
--#endif
--#ifdef KEY_SBEG
-- keydef("Key_Shift_Begin", "KEY_SBEG", KEY_SBEG, mode);
--#endif
--#ifdef KEY_SCANCEL
-- keydef("Key_Shift_Cancel", "KEY_SCANCEL", KEY_SCANCEL, mode);
--#endif
--#ifdef KEY_SCOMMAND
-- keydef("Key_Shift_Command", "KEY_SCOMMAND", KEY_SCOMMAND, mode);
--#endif
--#ifdef KEY_SCOPY
-- keydef("Key_Shift_Copy", "KEY_SCOPY", KEY_SCOPY, mode);
--#endif
--#ifdef KEY_SCREATE
-- keydef("Key_Shift_Create", "KEY_SCREATE", KEY_SCREATE, mode);
--#endif
--#ifdef KEY_SDC
-- keydef("Key_Shift_Delete_Char", "KEY_SDC", KEY_SDC, mode);
--#endif
--#ifdef KEY_SDL
-- keydef("Key_Shift_Delete_Line", "KEY_SDL", KEY_SDL, mode);
--#endif
--#ifdef KEY_SELECT
-- keydef("Key_Select", "KEY_SELECT", KEY_SELECT, mode);
--#endif
--#ifdef KEY_SEND
-- keydef("Key_Shift_End", "KEY_SEND", KEY_SEND, mode);
--#endif
--#ifdef KEY_SEOL
-- keydef("Key_Shift_Clear_End_Of_Line", "KEY_SEOL", KEY_SEOL, mode);
--#endif
--#ifdef KEY_SEXIT
-- keydef("Key_Shift_Exit", "KEY_SEXIT", KEY_SEXIT, mode);
--#endif
--#ifdef KEY_SFIND
-- keydef("Key_Shift_Find", "KEY_SFIND", KEY_SFIND, mode);
--#endif
--#ifdef KEY_SHELP
-- keydef("Key_Shift_Help", "KEY_SHELP", KEY_SHELP, mode);
--#endif
--#ifdef KEY_SHOME
-- keydef("Key_Shift_Home", "KEY_SHOME", KEY_SHOME, mode);
--#endif
--#ifdef KEY_SIC
-- keydef("Key_Shift_Insert_Char", "KEY_SIC", KEY_SIC, mode);
--#endif
--#ifdef KEY_SLEFT
-- keydef("Key_Shift_Cursor_Left", "KEY_SLEFT", KEY_SLEFT, mode);
--#endif
--#ifdef KEY_SMESSAGE
-- keydef("Key_Shift_Message", "KEY_SMESSAGE", KEY_SMESSAGE, mode);
--#endif
--#ifdef KEY_SMOVE
-- keydef("Key_Shift_Move", "KEY_SMOVE", KEY_SMOVE, mode);
--#endif
--#ifdef KEY_SNEXT
-- keydef("Key_Shift_Next_Page", "KEY_SNEXT", KEY_SNEXT, mode);
--#endif
--#ifdef KEY_SOPTIONS
-- keydef("Key_Shift_Options", "KEY_SOPTIONS", KEY_SOPTIONS, mode);
--#endif
--#ifdef KEY_SPREVIOUS
-- keydef("Key_Shift_Previous_Page", "KEY_SPREVIOUS", KEY_SPREVIOUS, mode);
--#endif
--#ifdef KEY_SPRINT
-- keydef("Key_Shift_Print", "KEY_SPRINT", KEY_SPRINT, mode);
--#endif
--#ifdef KEY_SREDO
-- keydef("Key_Shift_Redo", "KEY_SREDO", KEY_SREDO, mode);
--#endif
--#ifdef KEY_SREPLACE
-- keydef("Key_Shift_Replace", "KEY_SREPLACE", KEY_SREPLACE, mode);
--#endif
--#ifdef KEY_SRIGHT
-- keydef("Key_Shift_Cursor_Right", "KEY_SRIGHT", KEY_SRIGHT, mode);
--#endif
--#ifdef KEY_SRSUME
-- keydef("Key_Shift_Resume", "KEY_SRSUME", KEY_SRSUME, mode);
--#endif
--#ifdef KEY_SSAVE
-- keydef("Key_Shift_Save", "KEY_SSAVE", KEY_SSAVE, mode);
--#endif
--#ifdef KEY_SSUSPEND
-- keydef("Key_Shift_Suspend", "KEY_SSUSPEND", KEY_SSUSPEND, mode);
--#endif
--#ifdef KEY_SUNDO
-- keydef("Key_Shift_Undo", "KEY_SUNDO", KEY_SUNDO, mode);
--#endif
--#ifdef KEY_SUSPEND
-- keydef("Key_Suspend", "KEY_SUSPEND", KEY_SUSPEND, mode);
--#endif
--#ifdef KEY_UNDO
-- keydef("Key_Undo", "KEY_UNDO", KEY_UNDO, mode);
--#endif
--#ifdef KEY_MOUSE
-- keydef("Key_Mouse", "KEY_MOUSE", KEY_MOUSE, mode);
--#endif
--#ifdef KEY_RESIZE
-- keydef("Key_Resize", "KEY_RESIZE", KEY_RESIZE, mode);
--#endif
--}
-+#define PRINT_NAMED_BITMASK(c_type, mask_macro) \
-+ PRINT_BITMASK (c_type, #mask_macro, mask_macro)
-
--/*
-- * Generate a constant with the given name. The second parameter
-- * is a reference to the ACS character in the acs_map[] array and
-- * will be translated into an index.
-- */
--static void
--acs_def(const char *name, chtype *a)
--{
-- int c = (int)(a - &acs_map[0]);
-+#define STRUCT_OFFSET(record, field) \
-+ { \
-+ UINT first, last; \
-+ record mask; \
-+ memset (&mask, 0, sizeof (mask)); \
-+ memset (&mask.field, 0xff, sizeof(mask.field)); \
-+ if (!find_pos ((UCHAR *)&mask, sizeof (mask), &first, &last)) \
-+ my_error ("failed to locate" #record "_" #field); \
-+ print_constant (#record "_" #field "_First", first); \
-+ print_constant (#record "_" #field "_Last", last); \
-+ }
-
-- printf(" %-24s : constant Character := ", name);
-- if (isprint(UChar(c)) && (c != '`'))
-- printf("'%c';\n", c);
-- else
-- printf("Character'Val (%d);\n", c);
--}
-+/*--------------------*/
-+/* Start of main (). */
-+/*--------------------*/
-
--/*
-- * Generate the constants for the ACS characters
-- */
--static void
--gen_acs(void)
-+int
-+main(int argc, const char *argv[])
- {
-- printf(" type C_ACS_Map is array (Character'Val (0) .. Character'Val (127))\n");
-- printf(" of Attributed_Character;\n");
--#if USE_REENTRANT || BROKEN_LINKER
-- printf(" type C_ACS_Ptr is access C_ACS_Map;\n");
-- printf(" function ACS_Map return C_ACS_Ptr;\n");
-- printf(" pragma Import (C, ACS_Map, \""
-- NCURSES_WRAP_PREFIX
-- "acs_map\");\n");
--#else
-- printf(" ACS_Map : C_ACS_Map;\n");
-- printf(" pragma Import (C, ACS_Map, \"acs_map\");\n");
--#endif
-- printf(" --\n");
-- printf(" --\n");
-- printf(" -- Constants for several characters from the Alternate Character Set\n");
-- printf(" -- You must use these constants as indices into the ACS_Map array\n");
-- printf(" -- to get the corresponding attributed character at runtime.\n");
-- printf(" --\n");
-+ const int x = 0x12345678;
-
--#ifdef ACS_ULCORNER
-- acs_def("ACS_Upper_Left_Corner", &ACS_ULCORNER);
--#endif
--#ifdef ACS_LLCORNER
-- acs_def("ACS_Lower_Left_Corner", &ACS_LLCORNER);
--#endif
--#ifdef ACS_URCORNER
-- acs_def("ACS_Upper_Right_Corner", &ACS_URCORNER);
--#endif
--#ifdef ACS_LRCORNER
-- acs_def("ACS_Lower_Right_Corner", &ACS_LRCORNER);
--#endif
--#ifdef ACS_LTEE
-- acs_def("ACS_Left_Tee", &ACS_LTEE);
--#endif
--#ifdef ACS_RTEE
-- acs_def("ACS_Right_Tee", &ACS_RTEE);
--#endif
--#ifdef ACS_BTEE
-- acs_def("ACS_Bottom_Tee", &ACS_BTEE);
--#endif
--#ifdef ACS_TTEE
-- acs_def("ACS_Top_Tee", &ACS_TTEE);
--#endif
--#ifdef ACS_HLINE
-- acs_def("ACS_Horizontal_Line", &ACS_HLINE);
--#endif
--#ifdef ACS_VLINE
-- acs_def("ACS_Vertical_Line", &ACS_VLINE);
--#endif
--#ifdef ACS_PLUS
-- acs_def("ACS_Plus_Symbol", &ACS_PLUS);
--#endif
--#ifdef ACS_S1
-- acs_def("ACS_Scan_Line_1", &ACS_S1);
--#endif
--#ifdef ACS_S9
-- acs_def("ACS_Scan_Line_9", &ACS_S9);
--#endif
--#ifdef ACS_DIAMOND
-- acs_def("ACS_Diamond", &ACS_DIAMOND);
--#endif
--#ifdef ACS_CKBOARD
-- acs_def("ACS_Checker_Board", &ACS_CKBOARD);
--#endif
--#ifdef ACS_DEGREE
-- acs_def("ACS_Degree", &ACS_DEGREE);
--#endif
--#ifdef ACS_PLMINUS
-- acs_def("ACS_Plus_Minus", &ACS_PLMINUS);
--#endif
--#ifdef ACS_BULLET
-- acs_def("ACS_Bullet", &ACS_BULLET);
--#endif
--#ifdef ACS_LARROW
-- acs_def("ACS_Left_Arrow", &ACS_LARROW);
--#endif
--#ifdef ACS_RARROW
-- acs_def("ACS_Right_Arrow", &ACS_RARROW);
--#endif
--#ifdef ACS_DARROW
-- acs_def("ACS_Down_Arrow", &ACS_DARROW);
--#endif
--#ifdef ACS_UARROW
-- acs_def("ACS_Up_Arrow", &ACS_UARROW);
--#endif
--#ifdef ACS_BOARD
-- acs_def("ACS_Board_Of_Squares", &ACS_BOARD);
--#endif
--#ifdef ACS_LANTERN
-- acs_def("ACS_Lantern", &ACS_LANTERN);
--#endif
--#ifdef ACS_BLOCK
-- acs_def("ACS_Solid_Block", &ACS_BLOCK);
--#endif
--#ifdef ACS_S3
-- acs_def("ACS_Scan_Line_3", &ACS_S3);
--#endif
--#ifdef ACS_S7
-- acs_def("ACS_Scan_Line_7", &ACS_S7);
--#endif
--#ifdef ACS_LEQUAL
-- acs_def("ACS_Less_Or_Equal", &ACS_LEQUAL);
--#endif
--#ifdef ACS_GEQUAL
-- acs_def("ACS_Greater_Or_Equal", &ACS_GEQUAL);
--#endif
--#ifdef ACS_PI
-- acs_def("ACS_PI", &ACS_PI);
--#endif
--#ifdef ACS_NEQUAL
-- acs_def("ACS_Not_Equal", &ACS_NEQUAL);
--#endif
--#ifdef ACS_STERLING
-- acs_def("ACS_Sterling", &ACS_STERLING);
--#endif
--}
-+ little_endian = (*((const char *)&x) == 0x78);
-
--#define GEN_EVENT(name,value) \
-- printf(" %-25s : constant Event_Mask := 8#%011lo#;\n", \
-- #name, value)
--
--#define GEN_MEVENT(name) \
-- printf(" %-25s : constant Event_Mask := 8#%011lo#;\n", \
-- #name, name)
-+ my_program_invocation_name = argv[0];
-
--static void
--gen_mouse_events(void)
--{
-- mmask_t all1 = 0;
-- mmask_t all2 = 0;
-- mmask_t all3 = 0;
-- mmask_t all4 = 0;
--
--#ifdef BUTTON1_RELEASED
-- GEN_MEVENT(BUTTON1_RELEASED);
-- all1 |= BUTTON1_RELEASED;
--#endif
--#ifdef BUTTON1_PRESSED
-- GEN_MEVENT(BUTTON1_PRESSED);
-- all1 |= BUTTON1_PRESSED;
--#endif
--#ifdef BUTTON1_CLICKED
-- GEN_MEVENT(BUTTON1_CLICKED);
-- all1 |= BUTTON1_CLICKED;
--#endif
--#ifdef BUTTON1_DOUBLE_CLICKED
-- GEN_MEVENT(BUTTON1_DOUBLE_CLICKED);
-- all1 |= BUTTON1_DOUBLE_CLICKED;
--#endif
--#ifdef BUTTON1_TRIPLE_CLICKED
-- GEN_MEVENT(BUTTON1_TRIPLE_CLICKED);
-- all1 |= BUTTON1_TRIPLE_CLICKED;
--#endif
--#ifdef BUTTON1_RESERVED_EVENT
-- GEN_MEVENT(BUTTON1_RESERVED_EVENT);
-- all1 |= BUTTON1_RESERVED_EVENT;
--#endif
--#ifdef BUTTON2_RELEASED
-- GEN_MEVENT(BUTTON2_RELEASED);
-- all2 |= BUTTON2_RELEASED;
--#endif
--#ifdef BUTTON2_PRESSED
-- GEN_MEVENT(BUTTON2_PRESSED);
-- all2 |= BUTTON2_PRESSED;
--#endif
--#ifdef BUTTON2_CLICKED
-- GEN_MEVENT(BUTTON2_CLICKED);
-- all2 |= BUTTON2_CLICKED;
--#endif
--#ifdef BUTTON2_DOUBLE_CLICKED
-- GEN_MEVENT(BUTTON2_DOUBLE_CLICKED);
-- all2 |= BUTTON2_DOUBLE_CLICKED;
--#endif
--#ifdef BUTTON2_TRIPLE_CLICKED
-- GEN_MEVENT(BUTTON2_TRIPLE_CLICKED);
-- all2 |= BUTTON2_TRIPLE_CLICKED;
--#endif
--#ifdef BUTTON2_RESERVED_EVENT
-- GEN_MEVENT(BUTTON2_RESERVED_EVENT);
-- all2 |= BUTTON2_RESERVED_EVENT;
--#endif
--#ifdef BUTTON3_RELEASED
-- GEN_MEVENT(BUTTON3_RELEASED);
-- all3 |= BUTTON3_RELEASED;
--#endif
--#ifdef BUTTON3_PRESSED
-- GEN_MEVENT(BUTTON3_PRESSED);
-- all3 |= BUTTON3_PRESSED;
--#endif
--#ifdef BUTTON3_CLICKED
-- GEN_MEVENT(BUTTON3_CLICKED);
-- all3 |= BUTTON3_CLICKED;
--#endif
--#ifdef BUTTON3_DOUBLE_CLICKED
-- GEN_MEVENT(BUTTON3_DOUBLE_CLICKED);
-- all3 |= BUTTON3_DOUBLE_CLICKED;
--#endif
--#ifdef BUTTON3_TRIPLE_CLICKED
-- GEN_MEVENT(BUTTON3_TRIPLE_CLICKED);
-- all3 |= BUTTON3_TRIPLE_CLICKED;
--#endif
--#ifdef BUTTON3_RESERVED_EVENT
-- GEN_MEVENT(BUTTON3_RESERVED_EVENT);
-- all3 |= BUTTON3_RESERVED_EVENT;
--#endif
--#ifdef BUTTON4_RELEASED
-- GEN_MEVENT(BUTTON4_RELEASED);
-- all4 |= BUTTON4_RELEASED;
--#endif
--#ifdef BUTTON4_PRESSED
-- GEN_MEVENT(BUTTON4_PRESSED);
-- all4 |= BUTTON4_PRESSED;
--#endif
--#ifdef BUTTON4_CLICKED
-- GEN_MEVENT(BUTTON4_CLICKED);
-- all4 |= BUTTON4_CLICKED;
--#endif
--#ifdef BUTTON4_DOUBLE_CLICKED
-- GEN_MEVENT(BUTTON4_DOUBLE_CLICKED);
-- all4 |= BUTTON4_DOUBLE_CLICKED;
--#endif
--#ifdef BUTTON4_TRIPLE_CLICKED
-- GEN_MEVENT(BUTTON4_TRIPLE_CLICKED);
-- all4 |= BUTTON4_TRIPLE_CLICKED;
--#endif
--#ifdef BUTTON4_RESERVED_EVENT
-- GEN_MEVENT(BUTTON4_RESERVED_EVENT);
-- all4 |= BUTTON4_RESERVED_EVENT;
--#endif
--#ifdef BUTTON_CTRL
-- GEN_MEVENT(BUTTON_CTRL);
--#endif
--#ifdef BUTTON_SHIFT
-- GEN_MEVENT(BUTTON_SHIFT);
--#endif
--#ifdef BUTTON_ALT
-- GEN_MEVENT(BUTTON_ALT);
--#endif
--#ifdef REPORT_MOUSE_POSITION
-- GEN_MEVENT(REPORT_MOUSE_POSITION);
--#endif
--#ifdef ALL_MOUSE_EVENTS
-- GEN_MEVENT(ALL_MOUSE_EVENTS);
--#endif
-+ if (KEY_MIN == 256)
-+ my_error("unexpected value for KEY_MIN: 256");
-
-- GEN_EVENT(BUTTON1_EVENTS, all1);
-- GEN_EVENT(BUTTON2_EVENTS, all2);
-- GEN_EVENT(BUTTON3_EVENTS, all3);
-- GEN_EVENT(BUTTON4_EVENTS, all4);
--}
-+ if (argc != 2)
-+ my_error("Only one argument expected (DFT_ARG_SUFFIX)");
-
--static void
--wrap_one_var(const char *c_var,
-- const char *c_type,
-- const char *ada_func,
-- const char *ada_type)
--{
--#if USE_REENTRANT
-- /* must wrap variables */
-+ printf("-- Generated by the C program %s (source " __FILE__ ").\n",
-+ my_program_invocation_name);
-+ printf("-- Do not edit this file directly.\n");
-+ printf("-- The values provided here may vary on your system.\n");
- printf("\n");
-- printf(" function %s return %s\n", ada_func, ada_type);
-- printf(" is\n");
-- printf(" function Result return %s;\n", c_type);
-- printf(" pragma Import (C, Result, \"" NCURSES_WRAP_PREFIX "%s\");\n", c_var);
-- printf(" begin\n");
-- if (strcmp(c_type, ada_type))
-- printf(" return %s (Result);\n", ada_type);
-- else
-- printf(" return Result;\n");
-- printf(" end %s;\n", ada_func);
--#else
-- /* global variables are really global */
-+ printf("with System;\n");
-+ printf("package Terminal_Interface.Curses_Constants is\n");
-+ printf(" pragma Pure;\n");
- printf("\n");
-- printf(" function %s return %s\n", ada_func, ada_type);
-- printf(" is\n");
-- printf(" Result : %s;\n", c_type);
-- printf(" pragma Import (C, Result, \"%s\");\n", c_var);
-- printf(" begin\n");
-- if (strcmp(c_type, ada_type))
-- printf(" return %s (Result);\n", ada_type);
-- else
-- printf(" return Result;\n");
-- printf(" end %s;\n", ada_func);
--#endif
--}
-
--#define GEN_PUBLIC_VAR(c_var, c_type, ada_func, ada_type) \
-- wrap_one_var(#c_var, #c_type, #ada_func, #ada_type)
--
--static void
--gen_public_vars(void)
--{
-- GEN_PUBLIC_VAR(stdscr, Window, Standard_Window, Window);
-- GEN_PUBLIC_VAR(curscr, Window, Current_Window, Window);
-- GEN_PUBLIC_VAR(LINES, C_Int, Lines, Line_Count);
-- GEN_PUBLIC_VAR(COLS, C_Int, Columns, Column_Count);
-- GEN_PUBLIC_VAR(TABSIZE, C_Int, Tab_Size, Natural);
-- GEN_PUBLIC_VAR(COLORS, C_Int, Number_Of_Colors, Natural);
-- GEN_PUBLIC_VAR(COLOR_PAIRS, C_Int, Number_Of_Color_Pairs, Natural);
--}
--
--/*
-- * Output some comment lines indicating that the file is generated.
-- * The name parameter is the name of the facility to be used in
-- * the comment.
-- */
--static void
--prologue(const char *name)
--{
-- printf("-- %s binding.\n", name);
-- printf("-- This module is generated. Please don't change it manually!\n");
-- printf("-- Run the generator instead.\n-- |");
--
-- printf("define(`M4_BIT_ORDER',`%s_Order_First')",
-+ printf(" DFT_ARG_SUFFIX : constant String := \"%s\";\n", argv[1]);
-+ printf(" Bit_Order : constant System.Bit_Order := System.%s_Order_First;\n",
- little_endian ? "Low" : "High");
--}
-+ print_constant("Sizeof_Bool", 8 * sizeof(bool));
-
--/*
-- * Write the prologue for the curses facility and make sure that
-- * KEY_MIN and KEY_MAX are defined for the rest of this source.
-- */
--static void
--basedefs(void)
--{
-- prologue("curses");
--#ifndef KEY_MAX
--# define KEY_MAX 0777
--#endif
-- printf("define(`M4_KEY_MAX',`8#%o#')", KEY_MAX);
--#ifndef KEY_MIN
--# define KEY_MIN 0401
-+ PRINT_NAMED_CONSTANT(OK);
-+ PRINT_NAMED_CONSTANT(ERR);
-+ printf(" pragma Warnings (Off); -- redefinition of Standard.True and False\n");
-+ PRINT_NAMED_CONSTANT(TRUE);
-+ PRINT_NAMED_CONSTANT(FALSE);
-+ printf(" pragma Warnings (On);\n");
-+
-+ print_comment("Version of the ncurses library from extensions(3NCURSES)");
-+ PRINT_NAMED_CONSTANT(NCURSES_VERSION_MAJOR);
-+ PRINT_NAMED_CONSTANT(NCURSES_VERSION_MINOR);
-+ printf(" Version : constant String := \"%d.%d\";\n",
-+ NCURSES_VERSION_MAJOR, NCURSES_VERSION_MINOR);
-+
-+ print_comment("Character non-color attributes from attr(3NCURSES)");
-+ printf(" -- attr_t and chtype may be signed in C.\n");
-+ printf(" type attr_t is mod 2 ** %lu;\n", (long unsigned)(8 * sizeof(attr_t)));
-+ PRINT_NAMED_BITMASK(attr_t, A_CHARTEXT);
-+ PRINT_NAMED_BITMASK(attr_t, A_COLOR);
-+ PRINT_BITMASK(attr_t, "Attr", A_ATTRIBUTES & ~A_COLOR);
-+ PRINT_NAMED_BITMASK(attr_t, A_STANDOUT);
-+ PRINT_NAMED_BITMASK(attr_t, A_UNDERLINE);
-+ PRINT_NAMED_BITMASK(attr_t, A_REVERSE);
-+ PRINT_NAMED_BITMASK(attr_t, A_BLINK);
-+ PRINT_NAMED_BITMASK(attr_t, A_DIM);
-+ PRINT_NAMED_BITMASK(attr_t, A_BOLD);
-+ PRINT_NAMED_BITMASK(attr_t, A_PROTECT);
-+ PRINT_NAMED_BITMASK(attr_t, A_INVIS);
-+ PRINT_NAMED_BITMASK(attr_t, A_ALTCHARSET);
-+ PRINT_NAMED_BITMASK(attr_t, A_HORIZONTAL);
-+ PRINT_NAMED_BITMASK(attr_t, A_LEFT);
-+ PRINT_NAMED_BITMASK(attr_t, A_LOW);
-+ PRINT_NAMED_BITMASK(attr_t, A_RIGHT);
-+ PRINT_NAMED_BITMASK(attr_t, A_TOP);
-+ PRINT_NAMED_BITMASK(attr_t, A_VERTICAL);
-+ print_constant("chtype_Size", 8 * sizeof(chtype));
-+
-+ print_comment("predefined color numbers from color(3NCURSES)");
-+ PRINT_NAMED_CONSTANT(COLOR_BLACK);
-+ PRINT_NAMED_CONSTANT(COLOR_RED);
-+ PRINT_NAMED_CONSTANT(COLOR_GREEN);
-+ PRINT_NAMED_CONSTANT(COLOR_YELLOW);
-+ PRINT_NAMED_CONSTANT(COLOR_BLUE);
-+ PRINT_NAMED_CONSTANT(COLOR_MAGENTA);
-+ PRINT_NAMED_CONSTANT(COLOR_CYAN);
-+ PRINT_NAMED_CONSTANT(COLOR_WHITE);
-+
-+ print_comment("ETI return codes from ncurses.h");
-+ PRINT_NAMED_CONSTANT(E_OK);
-+ PRINT_NAMED_CONSTANT(E_SYSTEM_ERROR);
-+ PRINT_NAMED_CONSTANT(E_BAD_ARGUMENT);
-+ PRINT_NAMED_CONSTANT(E_POSTED);
-+ PRINT_NAMED_CONSTANT(E_CONNECTED);
-+ PRINT_NAMED_CONSTANT(E_BAD_STATE);
-+ PRINT_NAMED_CONSTANT(E_NO_ROOM);
-+ PRINT_NAMED_CONSTANT(E_NOT_POSTED);
-+ PRINT_NAMED_CONSTANT(E_UNKNOWN_COMMAND);
-+ PRINT_NAMED_CONSTANT(E_NO_MATCH);
-+ PRINT_NAMED_CONSTANT(E_NOT_SELECTABLE);
-+ PRINT_NAMED_CONSTANT(E_NOT_CONNECTED);
-+ PRINT_NAMED_CONSTANT(E_REQUEST_DENIED);
-+ PRINT_NAMED_CONSTANT(E_INVALID_FIELD);
-+ PRINT_NAMED_CONSTANT(E_CURRENT);
-+
-+ print_comment("Input key codes not defined in any ncurses manpage");
-+ PRINT_NAMED_CONSTANT(KEY_MIN);
-+ PRINT_NAMED_CONSTANT(KEY_MAX);
-+#ifdef KEY_CODE_YES
-+ PRINT_NAMED_CONSTANT(KEY_CODE_YES);
- #endif
-- if (KEY_MIN == 256)
-- {
-- fprintf(stderr, "Unexpected value for KEY_MIN: %d\n", KEY_MIN);
-- exit(1);
-- }
-- printf("define(`M4_SPECIAL_FIRST',`8#%o#')", KEY_MIN - 1);
--}
--
--/*
-- * Write out the comment lines for the menu facility
-- */
--static void
--menu_basedefs(void)
--{
-- prologue("menu");
--}
-
--/*
-- * Write out the comment lines for the form facility
-- */
--static void
--form_basedefs(void)
--{
-- prologue("form");
--}
-+ print_comment("Input key codes from getch(3NCURSES)");
-+ PRINT_NAMED_CONSTANT(KEY_BREAK);
-+ PRINT_NAMED_CONSTANT(KEY_DOWN);
-+ PRINT_NAMED_CONSTANT(KEY_UP);
-+ PRINT_NAMED_CONSTANT(KEY_LEFT);
-+ PRINT_NAMED_CONSTANT(KEY_RIGHT);
-+ PRINT_NAMED_CONSTANT(KEY_HOME);
-+ PRINT_NAMED_CONSTANT(KEY_BACKSPACE);
-+ PRINT_NAMED_CONSTANT(KEY_F0);
-+ print_constant("KEY_F1", KEY_F(1));
-+ print_constant("KEY_F2", KEY_F(2));
-+ print_constant("KEY_F3", KEY_F(3));
-+ print_constant("KEY_F4", KEY_F(4));
-+ print_constant("KEY_F5", KEY_F(5));
-+ print_constant("KEY_F6", KEY_F(6));
-+ print_constant("KEY_F7", KEY_F(7));
-+ print_constant("KEY_F8", KEY_F(8));
-+ print_constant("KEY_F9", KEY_F(9));
-+ print_constant("KEY_F10", KEY_F(10));
-+ print_constant("KEY_F11", KEY_F(11));
-+ print_constant("KEY_F12", KEY_F(12));
-+ print_constant("KEY_F13", KEY_F(13));
-+ print_constant("KEY_F14", KEY_F(14));
-+ print_constant("KEY_F15", KEY_F(15));
-+ print_constant("KEY_F16", KEY_F(16));
-+ print_constant("KEY_F17", KEY_F(17));
-+ print_constant("KEY_F18", KEY_F(18));
-+ print_constant("KEY_F19", KEY_F(19));
-+ print_constant("KEY_F20", KEY_F(20));
-+ print_constant("KEY_F21", KEY_F(21));
-+ print_constant("KEY_F22", KEY_F(22));
-+ print_constant("KEY_F23", KEY_F(23));
-+ print_constant("KEY_F24", KEY_F(24));
-+ PRINT_NAMED_CONSTANT(KEY_DL);
-+ PRINT_NAMED_CONSTANT(KEY_IL);
-+ PRINT_NAMED_CONSTANT(KEY_DC);
-+ PRINT_NAMED_CONSTANT(KEY_IC);
-+ PRINT_NAMED_CONSTANT(KEY_EIC);
-+ PRINT_NAMED_CONSTANT(KEY_CLEAR);
-+ PRINT_NAMED_CONSTANT(KEY_EOS);
-+ PRINT_NAMED_CONSTANT(KEY_EOL);
-+ PRINT_NAMED_CONSTANT(KEY_SF);
-+ PRINT_NAMED_CONSTANT(KEY_SR);
-+ PRINT_NAMED_CONSTANT(KEY_NPAGE);
-+ PRINT_NAMED_CONSTANT(KEY_PPAGE);
-+ PRINT_NAMED_CONSTANT(KEY_STAB);
-+ PRINT_NAMED_CONSTANT(KEY_CTAB);
-+ PRINT_NAMED_CONSTANT(KEY_CATAB);
-+ PRINT_NAMED_CONSTANT(KEY_ENTER);
-+ PRINT_NAMED_CONSTANT(KEY_SRESET);
-+ PRINT_NAMED_CONSTANT(KEY_RESET);
-+ PRINT_NAMED_CONSTANT(KEY_PRINT);
-+ PRINT_NAMED_CONSTANT(KEY_LL);
-+ PRINT_NAMED_CONSTANT(KEY_A1);
-+ PRINT_NAMED_CONSTANT(KEY_A3);
-+ PRINT_NAMED_CONSTANT(KEY_B2);
-+ PRINT_NAMED_CONSTANT(KEY_C1);
-+ PRINT_NAMED_CONSTANT(KEY_C3);
-+ PRINT_NAMED_CONSTANT(KEY_BTAB);
-+ PRINT_NAMED_CONSTANT(KEY_BEG);
-+ PRINT_NAMED_CONSTANT(KEY_CANCEL);
-+ PRINT_NAMED_CONSTANT(KEY_CLOSE);
-+ PRINT_NAMED_CONSTANT(KEY_COMMAND);
-+ PRINT_NAMED_CONSTANT(KEY_COPY);
-+ PRINT_NAMED_CONSTANT(KEY_CREATE);
-+ PRINT_NAMED_CONSTANT(KEY_END);
-+ PRINT_NAMED_CONSTANT(KEY_EXIT);
-+ PRINT_NAMED_CONSTANT(KEY_FIND);
-+ PRINT_NAMED_CONSTANT(KEY_HELP);
-+ PRINT_NAMED_CONSTANT(KEY_MARK);
-+ PRINT_NAMED_CONSTANT(KEY_MESSAGE);
-+ PRINT_NAMED_CONSTANT(KEY_MOVE);
-+ PRINT_NAMED_CONSTANT(KEY_NEXT);
-+ PRINT_NAMED_CONSTANT(KEY_OPEN);
-+ PRINT_NAMED_CONSTANT(KEY_OPTIONS);
-+ PRINT_NAMED_CONSTANT(KEY_PREVIOUS);
-+ PRINT_NAMED_CONSTANT(KEY_REDO);
-+ PRINT_NAMED_CONSTANT(KEY_REFERENCE);
-+ PRINT_NAMED_CONSTANT(KEY_REFRESH);
-+ PRINT_NAMED_CONSTANT(KEY_REPLACE);
-+ PRINT_NAMED_CONSTANT(KEY_RESTART);
-+ PRINT_NAMED_CONSTANT(KEY_RESUME);
-+ PRINT_NAMED_CONSTANT(KEY_SAVE);
-+ PRINT_NAMED_CONSTANT(KEY_SBEG);
-+ PRINT_NAMED_CONSTANT(KEY_SCANCEL);
-+ PRINT_NAMED_CONSTANT(KEY_SCOMMAND);
-+ PRINT_NAMED_CONSTANT(KEY_SCOPY);
-+ PRINT_NAMED_CONSTANT(KEY_SCREATE);
-+ PRINT_NAMED_CONSTANT(KEY_SDC);
-+ PRINT_NAMED_CONSTANT(KEY_SDL);
-+ PRINT_NAMED_CONSTANT(KEY_SELECT);
-+ PRINT_NAMED_CONSTANT(KEY_SEND);
-+ PRINT_NAMED_CONSTANT(KEY_SEOL);
-+ PRINT_NAMED_CONSTANT(KEY_SEXIT);
-+ PRINT_NAMED_CONSTANT(KEY_SFIND);
-+ PRINT_NAMED_CONSTANT(KEY_SHELP);
-+ PRINT_NAMED_CONSTANT(KEY_SHOME);
-+ PRINT_NAMED_CONSTANT(KEY_SIC);
-+ PRINT_NAMED_CONSTANT(KEY_SLEFT);
-+ PRINT_NAMED_CONSTANT(KEY_SMESSAGE);
-+ PRINT_NAMED_CONSTANT(KEY_SMOVE);
-+ PRINT_NAMED_CONSTANT(KEY_SNEXT);
-+ PRINT_NAMED_CONSTANT(KEY_SOPTIONS);
-+ PRINT_NAMED_CONSTANT(KEY_SPREVIOUS);
-+ PRINT_NAMED_CONSTANT(KEY_SPRINT);
-+ PRINT_NAMED_CONSTANT(KEY_SREDO);
-+ PRINT_NAMED_CONSTANT(KEY_SREPLACE);
-+ PRINT_NAMED_CONSTANT(KEY_SRIGHT);
-+ PRINT_NAMED_CONSTANT(KEY_SRSUME);
-+ PRINT_NAMED_CONSTANT(KEY_SSAVE);
-+ PRINT_NAMED_CONSTANT(KEY_SSUSPEND);
-+ PRINT_NAMED_CONSTANT(KEY_SUNDO);
-+ PRINT_NAMED_CONSTANT(KEY_SUSPEND);
-+ PRINT_NAMED_CONSTANT(KEY_UNDO);
-+ PRINT_NAMED_CONSTANT(KEY_MOUSE);
-+ PRINT_NAMED_CONSTANT(KEY_RESIZE);
-+
-+ print_comment("alternate character codes (ACS) from addch(3NCURSES)");
-+#define PRINT_ACS(name) print_constant (#name, &name - &acs_map[0])
-+ PRINT_ACS(ACS_ULCORNER);
-+ PRINT_ACS(ACS_LLCORNER);
-+ PRINT_ACS(ACS_URCORNER);
-+ PRINT_ACS(ACS_LRCORNER);
-+ PRINT_ACS(ACS_LTEE);
-+ PRINT_ACS(ACS_RTEE);
-+ PRINT_ACS(ACS_BTEE);
-+ PRINT_ACS(ACS_TTEE);
-+ PRINT_ACS(ACS_HLINE);
-+ PRINT_ACS(ACS_VLINE);
-+ PRINT_ACS(ACS_PLUS);
-+ PRINT_ACS(ACS_S1);
-+ PRINT_ACS(ACS_S9);
-+ PRINT_ACS(ACS_DIAMOND);
-+ PRINT_ACS(ACS_CKBOARD);
-+ PRINT_ACS(ACS_DEGREE);
-+ PRINT_ACS(ACS_PLMINUS);
-+ PRINT_ACS(ACS_BULLET);
-+ PRINT_ACS(ACS_LARROW);
-+ PRINT_ACS(ACS_RARROW);
-+ PRINT_ACS(ACS_DARROW);
-+ PRINT_ACS(ACS_UARROW);
-+ PRINT_ACS(ACS_BOARD);
-+ PRINT_ACS(ACS_LANTERN);
-+ PRINT_ACS(ACS_BLOCK);
-+ PRINT_ACS(ACS_S3);
-+ PRINT_ACS(ACS_S7);
-+ PRINT_ACS(ACS_LEQUAL);
-+ PRINT_ACS(ACS_GEQUAL);
-+ PRINT_ACS(ACS_PI);
-+ PRINT_ACS(ACS_NEQUAL);
-+ PRINT_ACS(ACS_STERLING);
-+
-+ print_comment("Menu_Options from opts(3MENU)");
-+ PRINT_NAMED_BITMASK(Menu_Options, O_ONEVALUE);
-+ PRINT_NAMED_BITMASK(Menu_Options, O_SHOWDESC);
-+ PRINT_NAMED_BITMASK(Menu_Options, O_ROWMAJOR);
-+ PRINT_NAMED_BITMASK(Menu_Options, O_IGNORECASE);
-+ PRINT_NAMED_BITMASK(Menu_Options, O_SHOWMATCH);
-+ PRINT_NAMED_BITMASK(Menu_Options, O_NONCYCLIC);
-+ print_constant("Menu_Options_Size", 8 * sizeof(Menu_Options));
-+
-+ print_comment("Item_Options from menu_opts(3MENU)");
-+ PRINT_NAMED_BITMASK(Item_Options, O_SELECTABLE);
-+ print_constant("Item_Options_Size", 8 * sizeof(Item_Options));
-+
-+ print_comment("Field_Options from field_opts(3FORM)");
-+ PRINT_NAMED_BITMASK(Field_Options, O_VISIBLE);
-+ PRINT_NAMED_BITMASK(Field_Options, O_ACTIVE);
-+ PRINT_NAMED_BITMASK(Field_Options, O_PUBLIC);
-+ PRINT_NAMED_BITMASK(Field_Options, O_EDIT);
-+ PRINT_NAMED_BITMASK(Field_Options, O_WRAP);
-+ PRINT_NAMED_BITMASK(Field_Options, O_BLANK);
-+ PRINT_NAMED_BITMASK(Field_Options, O_AUTOSKIP);
-+ PRINT_NAMED_BITMASK(Field_Options, O_NULLOK);
-+ PRINT_NAMED_BITMASK(Field_Options, O_PASSOK);
-+ PRINT_NAMED_BITMASK(Field_Options, O_STATIC);
-+ print_constant("Field_Options_Size", 8 * sizeof(Field_Options));
-+
-+ print_comment("Field_Options from opts(3FORM)");
-+ PRINT_NAMED_BITMASK(Field_Options, O_NL_OVERLOAD);
-+ PRINT_NAMED_BITMASK(Field_Options, O_BS_OVERLOAD);
-+ /* Field_Options_Size is defined below */
-+
-+ print_comment("MEVENT structure from mouse(3NCURSES)");
-+ STRUCT_OFFSET(MEVENT, id);
-+ STRUCT_OFFSET(MEVENT, x);
-+ STRUCT_OFFSET(MEVENT, y);
-+ STRUCT_OFFSET(MEVENT, z);
-+ STRUCT_OFFSET(MEVENT, bstate);
-+ print_constant("MEVENT_Size", 8 * sizeof(MEVENT));
-
--/*
-- * Write out the comment lines for the mouse facility
-- */
--static void
--mouse_basedefs(void)
--{
-- prologue("mouse");
--}
--
--/*
-- * Write the definition of a single color
-- */
--static void
--color_def(const char *name, int value)
--{
-- printf(" %-16s : constant Color_Number := %d;\n", name, value);
--}
-+ print_comment("mouse events from mouse(3NCURSES)");
-+ {
-+ mmask_t all_events;
-
--/*
-- * Generate all color definitions
-- */
--static void
--gen_color(void)
--{
--#if HAVE_USE_DEFAULT_COLORS
-- color_def("Default_Color", -1);
--#endif
--#ifdef COLOR_BLACK
-- color_def("Black", COLOR_BLACK);
--#endif
--#ifdef COLOR_RED
-- color_def("Red", COLOR_RED);
--#endif
--#ifdef COLOR_GREEN
-- color_def("Green", COLOR_GREEN);
--#endif
--#ifdef COLOR_YELLOW
-- color_def("Yellow", COLOR_YELLOW);
--#endif
--#ifdef COLOR_BLUE
-- color_def("Blue", COLOR_BLUE);
--#endif
--#ifdef COLOR_MAGENTA
-- color_def("Magenta", COLOR_MAGENTA);
--#endif
--#ifdef COLOR_CYAN
-- color_def("Cyan", COLOR_CYAN);
--#endif
--#ifdef COLOR_WHITE
-- color_def("White", COLOR_WHITE);
-+#define PRINT_MOUSE_EVENT(event) \
-+ print_constant (#event, event); \
-+ all_events |= event
-+
-+ all_events = 0;
-+ PRINT_MOUSE_EVENT(BUTTON1_RELEASED);
-+ PRINT_MOUSE_EVENT(BUTTON1_PRESSED);
-+ PRINT_MOUSE_EVENT(BUTTON1_CLICKED);
-+ PRINT_MOUSE_EVENT(BUTTON1_DOUBLE_CLICKED);
-+ PRINT_MOUSE_EVENT(BUTTON1_TRIPLE_CLICKED);
-+#ifdef BUTTON1_RESERVED_EVENT
-+ PRINT_MOUSE_EVENT(BUTTON1_RESERVED_EVENT);
- #endif
--}
--
--/*
-- * Generate the linker options for the base facility
-- */
--static void
--gen_linkopts(void)
--{
-- printf(" pragma Linker_Options (\"-lncurses%s\");\n", model);
--}
-+ print_constant("all_events_button_1", (long)all_events);
-
--/*
-- * Generate the linker options for the menu facility
-- */
--static void
--gen_menu_linkopts(void)
--{
-- printf(" pragma Linker_Options (\"-lmenu%s\");\n", model);
--}
--
--/*
-- * Generate the linker options for the form facility
-- */
--static void
--gen_form_linkopts(void)
--{
-- printf(" pragma Linker_Options (\"-lform%s\");\n", model);
--}
--
--/*
-- * Generate the linker options for the panel facility
-- */
--static void
--gen_panel_linkopts(void)
--{
-- printf(" pragma Linker_Options (\"-lpanel%s\");\n", model);
--}
--
--static void
--gen_version_info(void)
--{
-- static const char *v1 =
-- " NC_Major_Version : constant := %d; -- Major version of the library\n";
-- static const char *v2 =
-- " NC_Minor_Version : constant := %d; -- Minor version of the library\n";
-- static const char *v3 =
-- " NC_Version : constant String := %c%d.%d%c; -- Version of library\n";
--
-- printf(v1, NCURSES_VERSION_MAJOR);
-- printf(v2, NCURSES_VERSION_MINOR);
-- printf(v3, '"', NCURSES_VERSION_MAJOR, NCURSES_VERSION_MINOR, '"');
--}
--
--static int
--eti_gen(char *buf, int code, const char *name, int *etimin, int *etimax)
--{
-- sprintf(buf, " E_%-16s : constant Eti_Error := %d;\n", name, code);
-- if (code < *etimin)
-- *etimin = code;
-- if (code > *etimax)
-- *etimax = code;
-- return (int)strlen(buf);
--}
--
--static void
--gen_offsets(void)
--{
-- const char *s_bool = "";
--
-- if (sizeof(bool) == sizeof(char))
-- {
-- s_bool = "char";
-- }
-- else if (sizeof(bool) == sizeof(short))
-- {
-- s_bool = "short";
-- }
-- else if (sizeof(bool) == sizeof(int))
-- {
-- s_bool = "int";
-- }
-- printf(" Sizeof%-*s : constant Natural := %2ld; -- %s\n",
-- 12, "_bool", (long)sizeof(bool), "bool");
--
-- printf(" type Curses_Bool is mod 2 ** Interfaces.C.%s'Size;\n", s_bool);
--}
--
--/*
-- * main() expects two arguments on the commandline, both single characters.
-- * The first character denotes the facility for which we generate output.
-- * Possible values are
-- * B - Base
-- * M - Menus
-- * F - Forms
-- * P - Pointer Device (Mouse)
-- * E - ETI base definitions
-- *
-- * The second character then denotes the specific output that should be
-- * generated for the selected facility.
-- */
--int
--main(int argc, char *argv[])
--{
-- int x = 0x12345678;
-- char *s = (char *)&x;
--
-- if (*s == 0x78)
-- little_endian = 1;
--
-- if (argc != 4)
-- exit(1);
-- model = *++argv;
--
-- switch (argv[1][0])
-- {
-- /* --------------------------------------------------------------- */
-- case 'B': /* The Base facility */
-- switch (argv[2][0])
-- {
-- case 'A': /* chtype translation into Ada95 record type */
-- gen_attr_set("Character_Attribute_Set");
-- break;
-- case 'B': /* write some initial comment lines */
-- basedefs();
-- break;
-- case 'C': /* generate color constants */
-- gen_color();
-- break;
-- case 'D': /* generate displacements of fields in WINDOW struct. */
-- gen_offsets();
-- break;
-- case 'E': /* generate Mouse Event codes */
-- gen_mouse_events();
-- break;
-- case 'K': /* translation of keycodes */
-- gen_keydefs(0);
-- break;
-- case 'L': /* generate the Linker_Options pragma */
-- gen_linkopts();
-- break;
-- case 'M': /* generate constants for the ACS characters */
-- gen_acs();
-- break;
-- case 'O': /* generate definitions of the old key code names */
-- gen_keydefs(1);
-- break;
-- case 'P': /* generate definitions of the public variables */
-- gen_public_vars();
-- break;
-- case 'R': /* generate representation clause for Attributed character */
-- gen_chtype_rep("Attributed_Character");
-- break;
-- case 'T': /* generate the Trace info */
-- gen_trace("Trace_Attribute_Set");
-- break;
-- case 'V': /* generate version info */
-- gen_version_info();
-- break;
-- default:
-- break;
-- }
-- break;
-- /* --------------------------------------------------------------- */
-- case 'M': /* The Menu facility */
-- switch (argv[2][0])
-- {
-- case 'R': /* generate representation clause for Menu_Option_Set */
-- gen_menu_opt_rep("Menu_Option_Set");
-- break;
-- case 'B': /* write some initial comment lines */
-- menu_basedefs();
-- break;
-- case 'L': /* generate the Linker_Options pragma */
-- gen_menu_linkopts();
-- break;
-- case 'I': /* generate representation clause for Item_Option_Set */
-- gen_item_opt_rep("Item_Option_Set");
-- break;
-- default:
-- break;
-- }
-- break;
-- /* --------------------------------------------------------------- */
-- case 'F': /* The Form facility */
-- switch (argv[2][0])
-- {
-- case 'R': /* generate representation clause for Form_Option_Set */
-- gen_form_opt_rep("Form_Option_Set");
-- break;
-- case 'B': /* write some initial comment lines */
-- form_basedefs();
-- break;
-- case 'L': /* generate the Linker_Options pragma */
-- gen_form_linkopts();
-- break;
-- case 'I': /* generate representation clause for Field_Option_Set */
-- gen_field_opt_rep("Field_Option_Set");
-- break;
-- default:
-- break;
-- }
-- break;
-- /* --------------------------------------------------------------- */
-- case 'P': /* The Pointer(=Mouse) facility */
-- switch (argv[2][0])
-- {
-- case 'B': /* write some initial comment lines */
-- mouse_basedefs();
-- break;
-- case 'M': /* generate representation clause for Mouse_Event */
-- gen_mrep_rep("Mouse_Event");
-- break;
-- case 'L': /* generate the Linker_Options pragma */
-- gen_panel_linkopts();
-- break;
-- default:
-- break;
-- }
-- break;
-- /* --------------------------------------------------------------- */
-- case 'E': /* chtype size detection */
-- switch (argv[2][0])
-- {
-- case 'C':
-- {
-- const char *fmt = " type C_Chtype is new %s;\n";
-- const char *afmt = " type C_AttrType is new %s;\n";
--
-- if (sizeof(chtype) == sizeof(int))
-- {
-- if (sizeof(int) == sizeof(long))
-- printf(fmt, "C_ULong");
--
-- else
-- printf(fmt, "C_UInt");
-- }
-- else if (sizeof(chtype) == sizeof(long))
-- {
-- printf(fmt, "C_ULong");
-- }
-- else
-- printf("Error\n");
--
-- if (sizeof(attr_t) == sizeof(int))
-- {
-- if (sizeof(int) == sizeof(long))
-- printf(afmt, "C_ULong");
--
-- else
-- printf(afmt, "C_UInt");
-- }
-- else if (sizeof(attr_t) == sizeof(long))
-- {
-- printf(afmt, "C_ULong");
-- }
-- else
-- printf("Error\n");
--
-- printf("define(`CF_CURSES_OK',`%d')", OK);
-- printf("define(`CF_CURSES_ERR',`%d')", ERR);
-- printf("define(`CF_CURSES_TRUE',`%d')", TRUE);
-- printf("define(`CF_CURSES_FALSE',`%d')", FALSE);
-- }
-- break;
-- case 'E':
-- {
-- char *buf = (char *)malloc(2048);
-- char *p = buf;
-- int etimin = E_OK;
-- int etimax = E_OK;
--
-- if (p)
-- {
-- p += eti_gen(p, E_OK, "Ok", &etimin, &etimax);
-- p += eti_gen(p, E_SYSTEM_ERROR, "System_Error", &etimin, &etimax);
-- p += eti_gen(p, E_BAD_ARGUMENT, "Bad_Argument", &etimin, &etimax);
-- p += eti_gen(p, E_POSTED, "Posted", &etimin, &etimax);
-- p += eti_gen(p, E_CONNECTED, "Connected", &etimin, &etimax);
-- p += eti_gen(p, E_BAD_STATE, "Bad_State", &etimin, &etimax);
-- p += eti_gen(p, E_NO_ROOM, "No_Room", &etimin, &etimax);
-- p += eti_gen(p, E_NOT_POSTED, "Not_Posted", &etimin, &etimax);
-- p += eti_gen(p, E_UNKNOWN_COMMAND,
-- "Unknown_Command", &etimin, &etimax);
-- p += eti_gen(p, E_NO_MATCH, "No_Match", &etimin, &etimax);
-- p += eti_gen(p, E_NOT_SELECTABLE,
-- "Not_Selectable", &etimin, &etimax);
-- p += eti_gen(p, E_NOT_CONNECTED,
-- "Not_Connected", &etimin, &etimax);
-- p += eti_gen(p, E_REQUEST_DENIED,
-- "Request_Denied", &etimin, &etimax);
-- p += eti_gen(p, E_INVALID_FIELD,
-- "Invalid_Field", &etimin, &etimax);
-- p += eti_gen(p, E_CURRENT,
-- "Current", &etimin, &etimax);
-- }
-- printf(" subtype Eti_Error is C_Int range %d .. %d;\n\n",
-- etimin, etimax);
-- printf("%s", buf);
-- }
-- break;
-- default:
-- break;
-- }
-- break;
-- /* --------------------------------------------------------------- */
-- case 'V': /* plain version dump */
-- {
-- switch (argv[2][0])
-- {
-- case '1': /* major version */
--#ifdef NCURSES_VERSION_MAJOR
-- printf("%d", NCURSES_VERSION_MAJOR);
-+ all_events = 0;
-+ PRINT_MOUSE_EVENT(BUTTON2_RELEASED);
-+ PRINT_MOUSE_EVENT(BUTTON2_PRESSED);
-+ PRINT_MOUSE_EVENT(BUTTON2_CLICKED);
-+ PRINT_MOUSE_EVENT(BUTTON2_DOUBLE_CLICKED);
-+ PRINT_MOUSE_EVENT(BUTTON2_TRIPLE_CLICKED);
-+#ifdef BUTTON2_RESERVED_EVENT
-+ PRINT_MOUSE_EVENT(BUTTON2_RESERVED_EVENT);
- #endif
-- break;
-- case '2': /* minor version */
--#ifdef NCURSES_VERSION_MINOR
-- printf("%d", NCURSES_VERSION_MINOR);
-+ print_constant("all_events_button_2", (long)all_events);
-+
-+ all_events = 0;
-+ PRINT_MOUSE_EVENT(BUTTON3_RELEASED);
-+ PRINT_MOUSE_EVENT(BUTTON3_PRESSED);
-+ PRINT_MOUSE_EVENT(BUTTON3_CLICKED);
-+ PRINT_MOUSE_EVENT(BUTTON3_DOUBLE_CLICKED);
-+ PRINT_MOUSE_EVENT(BUTTON3_TRIPLE_CLICKED);
-+#ifdef BUTTON3_RESERVED_EVENT
-+ PRINT_MOUSE_EVENT(BUTTON3_RESERVED_EVENT);
- #endif
-- break;
-- case '3': /* patch level */
--#ifdef NCURSES_VERSION_PATCH
-- printf("%d", NCURSES_VERSION_PATCH);
-+ print_constant("all_events_button_3", (long)all_events);
-+
-+ all_events = 0;
-+ PRINT_MOUSE_EVENT(BUTTON4_RELEASED);
-+ PRINT_MOUSE_EVENT(BUTTON4_PRESSED);
-+ PRINT_MOUSE_EVENT(BUTTON4_CLICKED);
-+ PRINT_MOUSE_EVENT(BUTTON4_DOUBLE_CLICKED);
-+ PRINT_MOUSE_EVENT(BUTTON4_TRIPLE_CLICKED);
-+#ifdef BUTTON4_RESERVED_EVENT
-+ PRINT_MOUSE_EVENT(BUTTON4_RESERVED_EVENT);
- #endif
-- break;
-- default:
-- break;
-- }
-- }
-- break;
-- /* --------------------------------------------------------------- */
-- default:
-- break;
-- }
-- return 0;
-+ print_constant("all_events_button_4", (long)all_events);
-+ }
-+ PRINT_NAMED_CONSTANT(BUTTON_CTRL);
-+ PRINT_NAMED_CONSTANT(BUTTON_SHIFT);
-+ PRINT_NAMED_CONSTANT(BUTTON_ALT);
-+ PRINT_NAMED_CONSTANT(REPORT_MOUSE_POSITION);
-+ PRINT_NAMED_CONSTANT(ALL_MOUSE_EVENTS);
-+
-+ print_comment("trace selection from trace(3NCURSES)");
-+ PRINT_NAMED_BITMASK(UINT, TRACE_TIMES);
-+ PRINT_NAMED_BITMASK(UINT, TRACE_TPUTS);
-+ PRINT_NAMED_BITMASK(UINT, TRACE_UPDATE);
-+ PRINT_NAMED_BITMASK(UINT, TRACE_MOVE);
-+ PRINT_NAMED_BITMASK(UINT, TRACE_CHARPUT);
-+ PRINT_NAMED_BITMASK(UINT, TRACE_CALLS);
-+ PRINT_NAMED_BITMASK(UINT, TRACE_VIRTPUT);
-+ PRINT_NAMED_BITMASK(UINT, TRACE_IEVENT);
-+ PRINT_NAMED_BITMASK(UINT, TRACE_BITS);
-+ PRINT_NAMED_BITMASK(UINT, TRACE_ICALLS);
-+ PRINT_NAMED_BITMASK(UINT, TRACE_CCALLS);
-+ PRINT_NAMED_BITMASK(UINT, TRACE_DATABASE);
-+ PRINT_NAMED_BITMASK(UINT, TRACE_ATTRS);
-+ print_constant("Trace_Size", 8 * sizeof(UINT));
-+
-+ printf("end Terminal_Interface.Curses_Constants;\n");
-+ exit(EXIT_SUCCESS);
- }
-Index: Ada95/gen/terminal_interface-curses-aux.ads.m4
---- ncurses-5.9/Ada95/gen/terminal_interface-curses-aux.ads.m4 2011-03-19 12:37:41.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/gen/terminal_interface-curses-aux.ads.m4 2014-05-24 21:31:05.000000000 +0000
-@@ -10,7 +10,7 @@
- -- S P E C --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -38,14 +38,12 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.18 $
-+-- $Revision: 1.23 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
--include(`Base_Defs')
- with System;
- with Interfaces.C;
- with Interfaces.C.Strings; use Interfaces.C.Strings;
--with Unchecked_Conversion;
-
- package Terminal_Interface.Curses.Aux is
- pragma Preelaborate (Terminal_Interface.Curses.Aux);
-@@ -60,39 +58,39 @@
- subtype C_ULong is Interfaces.C.unsigned_long;
- subtype C_Char_Ptr is Interfaces.C.Strings.chars_ptr;
- type C_Void_Ptr is new System.Address;
--include(`Chtype_Def')
-+
- -- This is how those constants are defined in ncurses. I see them also
- -- exactly like this in all ETI implementations I ever tested. So it
- -- could be that this is quite general, but please check with your curses.
- -- This is critical, because curses sometime mixes Boolean returns with
- -- returning an error status.
-- Curses_Ok : constant C_Int := CF_CURSES_OK;
-- Curses_Err : constant C_Int := CF_CURSES_ERR;
-+ Curses_Ok : constant C_Int := Curses_Constants.OK;
-+ Curses_Err : constant C_Int := Curses_Constants.ERR;
-
-- Curses_True : constant C_Int := CF_CURSES_TRUE;
-- Curses_False : constant C_Int := CF_CURSES_FALSE;
-+ Curses_True : constant C_Int := Curses_Constants.TRUE;
-+ Curses_False : constant C_Int := Curses_Constants.FALSE;
-
- -- Eti_Error: type for error codes returned by the menu and form subsystem
--include(`Eti_Defs')
-+ type Eti_Error is
-+ (E_Current,
-+ E_Invalid_Field,
-+ E_Request_Denied,
-+ E_Not_Connected,
-+ E_Not_Selectable,
-+ E_No_Match,
-+ E_Unknown_Command,
-+ E_Not_Posted,
-+ E_No_Room,
-+ E_Bad_State,
-+ E_Connected,
-+ E_Posted,
-+ E_Bad_Argument,
-+ E_System_Error,
-+ E_Ok);
-+
- procedure Eti_Exception (Code : Eti_Error);
-- -- Dispatch the error code and raise the appropriate exception
-- --
-- --
-- -- Some helpers
-- function Chtype_To_AttrChar is new
-- Unchecked_Conversion (Source => C_Chtype,
-- Target => Attributed_Character);
-- function AttrChar_To_Chtype is new
-- Unchecked_Conversion (Source => Attributed_Character,
-- Target => C_Chtype);
--
-- function AttrChar_To_AttrType is new
-- Unchecked_Conversion (Source => Attributed_Character,
-- Target => C_AttrType);
--
-- function AttrType_To_AttrChar is new
-- Unchecked_Conversion (Source => C_AttrType,
-- Target => Attributed_Character);
-+ -- Do nothing if Code = E_Ok.
-+ -- Else dispatch the error code and raise the appropriate exception.
-
- procedure Fill_String (Cp : chars_ptr;
- Str : out String);
-@@ -102,4 +100,23 @@
- function Fill_String (Cp : chars_ptr) return String;
- -- Same but as function.
-
-+private
-+ for Eti_Error'Size use C_Int'Size;
-+ pragma Convention (C, Eti_Error);
-+ for Eti_Error use
-+ (E_Current => Curses_Constants.E_CURRENT,
-+ E_Invalid_Field => Curses_Constants.E_INVALID_FIELD,
-+ E_Request_Denied => Curses_Constants.E_REQUEST_DENIED,
-+ E_Not_Connected => Curses_Constants.E_NOT_CONNECTED,
-+ E_Not_Selectable => Curses_Constants.E_NOT_SELECTABLE,
-+ E_No_Match => Curses_Constants.E_NO_MATCH,
-+ E_Unknown_Command => Curses_Constants.E_UNKNOWN_COMMAND,
-+ E_Not_Posted => Curses_Constants.E_NOT_POSTED,
-+ E_No_Room => Curses_Constants.E_NO_ROOM,
-+ E_Bad_State => Curses_Constants.E_BAD_STATE,
-+ E_Connected => Curses_Constants.E_CONNECTED,
-+ E_Posted => Curses_Constants.E_POSTED,
-+ E_Bad_Argument => Curses_Constants.E_BAD_ARGUMENT,
-+ E_System_Error => Curses_Constants.E_SYSTEM_ERROR,
-+ E_Ok => Curses_Constants.E_OK);
- end Terminal_Interface.Curses.Aux;
-Index: Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4
---- ncurses-5.9/Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4 2011-03-18 23:10:43.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4 2014-05-24 21:31:05.000000000 +0000
-@@ -10,7 +10,7 @@
- -- S P E C --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -38,10 +38,11 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.16 $
-+-- $Revision: 1.19 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Interfaces.C;
-+with Terminal_Interface.Curses.Aux;
-
- package Terminal_Interface.Curses.Forms.Field_Types is
- pragma Preelaborate (Terminal_Interface.Curses.Forms.Field_Types);
-@@ -227,12 +228,12 @@
- Mak : Makearg_Function := Make_Arg'Access;
- Cop : Copyarg_Function := Copy_Arg'Access;
- Fre : Freearg_Function := Free_Arg'Access)
-- return C_Int;
-+ return Aux.Eti_Error;
- pragma Import (C, Set_Fieldtype_Arg, "set_fieldtype_arg");
-
- function Set_Fieldtype_Choice (Cft : C_Field_Type;
- Next, Prev : Choice_Function)
-- return C_Int;
-+ return Aux.Eti_Error;
- pragma Import (C, Set_Fieldtype_Choice, "set_fieldtype_choice");
-
- end Terminal_Interface.Curses.Forms.Field_Types;
-Index: Ada95/gen/terminal_interface-curses-forms.ads.m4
---- ncurses-5.9/Ada95/gen/terminal_interface-curses-forms.ads.m4 2009-12-26 17:31:35.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/gen/terminal_interface-curses-forms.ads.m4 2014-05-24 21:31:57.000000000 +0000
-@@ -10,7 +10,7 @@
- -- S P E C --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2009,2014 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 --
-@@ -38,18 +38,17 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.30 $
---- $Date: 2009/12/26 17:31:35 $
-+-- $Revision: 1.33 $
-+-- $Date: 2014/05/24 21:31:57 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
--include(`Form_Base_Defs')
- with System;
- with Ada.Characters.Latin_1;
-
- package Terminal_Interface.Curses.Forms is
- pragma Preelaborate (Terminal_Interface.Curses.Forms);
--include(`Form_Linker_Options')dnl
--include(`Linker_Options')
-+ pragma Linker_Options ("-lform" & Curses_Constants.DFT_ARG_SUFFIX);
-+
- Space : Character renames Ada.Characters.Latin_1.Space;
-
- type Field is private;
-@@ -63,18 +62,68 @@
- Center,
- Right);
-
-+ type Field_Option_Set is
-+ record
-+ Visible : Boolean;
-+ Active : Boolean;
-+ Public : Boolean;
-+ Edit : Boolean;
-+ Wrap : Boolean;
-+ Blank : Boolean;
-+ Auto_Skip : Boolean;
-+ Null_Ok : Boolean;
-+ Pass_Ok : Boolean;
-+ Static : Boolean;
-+ end record;
-+ pragma Convention (C_Pass_By_Copy, Field_Option_Set);
-+
-+ for Field_Option_Set use
-+ record
-+ Visible at 0 range Curses_Constants.O_VISIBLE_First
-+ .. Curses_Constants.O_VISIBLE_Last;
-+ Active at 0 range Curses_Constants.O_ACTIVE_First
-+ .. Curses_Constants.O_ACTIVE_Last;
-+ Public at 0 range Curses_Constants.O_PUBLIC_First
-+ .. Curses_Constants.O_PUBLIC_Last;
-+ Edit at 0 range Curses_Constants.O_EDIT_First
-+ .. Curses_Constants.O_EDIT_Last;
-+ Wrap at 0 range Curses_Constants.O_WRAP_First
-+ .. Curses_Constants.O_WRAP_Last;
-+ Blank at 0 range Curses_Constants.O_BLANK_First
-+ .. Curses_Constants.O_BLANK_Last;
-+ Auto_Skip at 0 range Curses_Constants.O_AUTOSKIP_First
-+ .. Curses_Constants.O_AUTOSKIP_Last;
-+ Null_Ok at 0 range Curses_Constants.O_NULLOK_First
-+ .. Curses_Constants.O_NULLOK_Last;
-+ Pass_Ok at 0 range Curses_Constants.O_PASSOK_First
-+ .. Curses_Constants.O_PASSOK_Last;
-+ Static at 0 range Curses_Constants.O_STATIC_First
-+ .. Curses_Constants.O_STATIC_Last;
-+ end record;
- pragma Warnings (Off);
--include(`Field_Rep')Dnl
--
-+ for Field_Option_Set'Size use Curses_Constants.Field_Options_Size;
- pragma Warnings (On);
-
- function Default_Field_Options return Field_Option_Set;
- -- The initial defaults for the field options.
- pragma Inline (Default_Field_Options);
-
-+ type Form_Option_Set is
-+ record
-+ NL_Overload : Boolean;
-+ BS_Overload : Boolean;
-+ end record;
-+ pragma Convention (C_Pass_By_Copy, Form_Option_Set);
-+
-+ for Form_Option_Set use
-+ record
-+ NL_Overload at 0 range Curses_Constants.O_NL_OVERLOAD_First
-+ .. Curses_Constants.O_NL_OVERLOAD_Last;
-+ BS_Overload at 0 range Curses_Constants.O_BS_OVERLOAD_First
-+ .. Curses_Constants.O_BS_OVERLOAD_Last;
-+ end record;
- pragma Warnings (Off);
--include(`Form_Opt_Rep')Dnl
--
-+ for Form_Option_Set'Size use Curses_Constants.Field_Options_Size;
- pragma Warnings (On);
-
- function Default_Form_Options return Form_Option_Set;
-Index: Ada95/gen/terminal_interface-curses-menus.ads.m4
---- ncurses-5.9/Ada95/gen/terminal_interface-curses-menus.ads.m4 2009-12-26 18:35:22.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/gen/terminal_interface-curses-menus.ads.m4 2014-05-24 21:31:57.000000000 +0000
-@@ -10,7 +10,7 @@
- -- S P E C --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2009,2014 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 --
-@@ -38,18 +38,17 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.28 $
---- $Date: 2009/12/26 18:35:22 $
-+-- $Revision: 1.31 $
-+-- $Date: 2014/05/24 21:31:57 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
--include(`Menu_Base_Defs')
- with System;
- with Ada.Characters.Latin_1;
-
- package Terminal_Interface.Curses.Menus is
- pragma Preelaborate (Terminal_Interface.Curses.Menus);
--include(`Menu_Linker_Options')dnl
--include(`Linker_Options')
-+ pragma Linker_Options ("-lmenu" & Curses_Constants.DFT_ARG_SUFFIX);
-+
- Space : Character renames Ada.Characters.Latin_1.Space;
-
- type Item is private;
-@@ -116,9 +115,34 @@
- --
- -- Menu options
- --
-+ type Menu_Option_Set is
-+ record
-+ One_Valued : Boolean;
-+ Show_Descriptions : Boolean;
-+ Row_Major_Order : Boolean;
-+ Ignore_Case : Boolean;
-+ Show_Matches : Boolean;
-+ Non_Cyclic : Boolean;
-+ end record;
-+ pragma Convention (C_Pass_By_Copy, Menu_Option_Set);
-+
-+ for Menu_Option_Set use
-+ record
-+ One_Valued at 0 range Curses_Constants.O_ONEVALUE_First
-+ .. Curses_Constants.O_ONEVALUE_Last;
-+ Show_Descriptions at 0 range Curses_Constants.O_SHOWDESC_First
-+ .. Curses_Constants.O_SHOWDESC_Last;
-+ Row_Major_Order at 0 range Curses_Constants.O_ROWMAJOR_First
-+ .. Curses_Constants.O_ROWMAJOR_Last;
-+ Ignore_Case at 0 range Curses_Constants.O_IGNORECASE_First
-+ .. Curses_Constants.O_IGNORECASE_Last;
-+ Show_Matches at 0 range Curses_Constants.O_SHOWMATCH_First
-+ .. Curses_Constants.O_SHOWMATCH_Last;
-+ Non_Cyclic at 0 range Curses_Constants.O_NONCYCLIC_First
-+ .. Curses_Constants.O_NONCYCLIC_Last;
-+ end record;
- pragma Warnings (Off);
--include(`Menu_Opt_Rep')dnl
--
-+ for Menu_Option_Set'Size use Curses_Constants.Menu_Options_Size;
- pragma Warnings (On);
-
- function Default_Menu_Options return Menu_Option_Set;
-@@ -127,9 +151,19 @@
- --
- -- Item options
- --
-+ type Item_Option_Set is
-+ record
-+ Selectable : Boolean;
-+ end record;
-+ pragma Convention (C_Pass_By_Copy, Item_Option_Set);
-+
-+ for Item_Option_Set use
-+ record
-+ Selectable at 0 range Curses_Constants.O_SELECTABLE_First
-+ .. Curses_Constants.O_SELECTABLE_Last;
-+ end record;
- pragma Warnings (Off);
--include(`Item_Rep')dnl
--
-+ for Item_Option_Set'Size use Curses_Constants.Item_Options_Size;
- pragma Warnings (On);
-
- function Default_Item_Options return Item_Option_Set;
-Index: Ada95/gen/terminal_interface-curses-mouse.ads.m4
---- ncurses-5.9/Ada95/gen/terminal_interface-curses-mouse.ads.m4 2011-03-19 12:35:58.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/gen/terminal_interface-curses-mouse.ads.m4 2014-05-24 21:31:57.000000000 +0000
-@@ -10,7 +10,7 @@
- -- S P E C --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -38,11 +38,10 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.29 $
---- $Date: 2011/03/19 12:35:58 $
-+-- $Revision: 1.31 $
-+-- $Date: 2014/05/24 21:31:57 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
--include(`Mouse_Base_Defs')
- with System;
-
- package Terminal_Interface.Curses.Mouse is
-@@ -167,12 +166,35 @@
- end record;
- pragma Convention (C, Mouse_Event);
-
--include(`Mouse_Event_Rep')
-- Generation_Bit_Order : constant System.Bit_Order := System.M4_BIT_ORDER;
-- -- This constant may be different on your system.
--
--include(`Mouse_Events')
-- No_Events : constant Event_Mask := 0;
-- All_Events : constant Event_Mask := ALL_MOUSE_EVENTS;
-+ for Mouse_Event use
-+ record
-+ Id at 0 range Curses_Constants.MEVENT_id_First
-+ .. Curses_Constants.MEVENT_id_Last;
-+ X at 0 range Curses_Constants.MEVENT_x_First
-+ .. Curses_Constants.MEVENT_x_Last;
-+ Y at 0 range Curses_Constants.MEVENT_y_First
-+ .. Curses_Constants.MEVENT_y_Last;
-+ Z at 0 range Curses_Constants.MEVENT_z_First
-+ .. Curses_Constants.MEVENT_z_Last;
-+ Bstate at 0 range Curses_Constants.MEVENT_bstate_First
-+ .. Curses_Constants.MEVENT_bstate_Last;
-+ end record;
-+ for Mouse_Event'Size use Curses_Constants.MEVENT_Size;
-+ Generation_Bit_Order : System.Bit_Order renames Curses_Constants.Bit_Order;
-+
-+ BUTTON_CTRL : constant Event_Mask := Curses_Constants.BUTTON_CTRL;
-+ BUTTON_SHIFT : constant Event_Mask := Curses_Constants.BUTTON_SHIFT;
-+ BUTTON_ALT : constant Event_Mask := Curses_Constants.BUTTON_ALT;
-+ BUTTON1_EVENTS : constant Event_Mask
-+ := Curses_Constants.all_events_button_1;
-+ BUTTON2_EVENTS : constant Event_Mask
-+ := Curses_Constants.all_events_button_2;
-+ BUTTON3_EVENTS : constant Event_Mask
-+ := Curses_Constants.all_events_button_3;
-+ BUTTON4_EVENTS : constant Event_Mask
-+ := Curses_Constants.all_events_button_4;
-+ ALL_MOUSE_EVENTS : constant Event_Mask := Curses_Constants.ALL_MOUSE_EVENTS;
-+ No_Events : constant Event_Mask := 0;
-+ All_Events : constant Event_Mask := ALL_MOUSE_EVENTS;
-
- end Terminal_Interface.Curses.Mouse;
-Index: Ada95/gen/terminal_interface-curses-panels.ads.m4
---- ncurses-5.9/Ada95/gen/terminal_interface-curses-panels.ads.m4 2009-12-26 17:38:58.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/gen/terminal_interface-curses-panels.ads.m4 2014-05-24 21:31:57.000000000 +0000
-@@ -10,7 +10,7 @@
- -- S P E C --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2009,2014 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 --
-@@ -38,16 +38,16 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.20 $
---- $Date: 2009/12/26 17:38:58 $
-+-- $Revision: 1.22 $
-+-- $Date: 2014/05/24 21:31:57 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with System;
-
- package Terminal_Interface.Curses.Panels is
- pragma Preelaborate (Terminal_Interface.Curses.Panels);
--include(`Panel_Linker_Options')dnl
--include(`Linker_Options')
-+ pragma Linker_Options ("-lpanel" & Curses_Constants.DFT_ARG_SUFFIX);
-+
- type Panel is private;
-
- ---------------------------
-Index: Ada95/gen/terminal_interface-curses-trace.ads.m4
---- ncurses-5.9/Ada95/gen/terminal_interface-curses-trace.ads.m4 2000-12-02 22:31:21.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/gen/terminal_interface-curses-trace.ads.m4 2014-05-24 21:31:05.000000000 +0000
-@@ -9,7 +9,7 @@
- -- S P E C --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 2000 Free Software Foundation, Inc. --
-+-- Copyright (c) 2000,2014 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 --
-@@ -37,16 +37,62 @@
- ------------------------------------------------------------------------------
- -- Author: Eugene V. Melaragno 2000
- -- Version Control:
---- $Revision: 1.1 $
-+-- $Revision: 1.4 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
-
- package Terminal_Interface.Curses.Trace is
- pragma Preelaborate (Terminal_Interface.Curses.Trace);
-
-- pragma Warnings (Off);
--include(`Trace_Defs')
-+ type Trace_Attribute_Set is
-+ record
-+ Times : Boolean;
-+ Tputs : Boolean;
-+ Update : Boolean;
-+ Cursor_Move : Boolean;
-+ Character_Output : Boolean;
-+ Calls : Boolean;
-+ Virtual_Puts : Boolean;
-+ Input_Events : Boolean;
-+ TTY_State : Boolean;
-+ Internal_Calls : Boolean;
-+ Character_Calls : Boolean;
-+ Termcap_TermInfo : Boolean;
-+ Attribute_Color : Boolean;
-+ end record;
-+ pragma Convention (C_Pass_By_Copy, Trace_Attribute_Set);
-
-+ for Trace_Attribute_Set use
-+ record
-+ Times at 0 range Curses_Constants.TRACE_TIMES_First
-+ .. Curses_Constants.TRACE_TIMES_Last;
-+ Tputs at 0 range Curses_Constants.TRACE_TPUTS_First
-+ .. Curses_Constants.TRACE_TPUTS_Last;
-+ Update at 0 range Curses_Constants.TRACE_UPDATE_First
-+ .. Curses_Constants.TRACE_UPDATE_Last;
-+ Cursor_Move at 0 range Curses_Constants.TRACE_MOVE_First
-+ .. Curses_Constants.TRACE_MOVE_Last;
-+ Character_Output at 0 range Curses_Constants.TRACE_CHARPUT_First
-+ .. Curses_Constants.TRACE_CHARPUT_Last;
-+ Calls at 0 range Curses_Constants.TRACE_CALLS_First
-+ .. Curses_Constants.TRACE_CALLS_Last;
-+ Virtual_Puts at 0 range Curses_Constants.TRACE_VIRTPUT_First
-+ .. Curses_Constants.TRACE_VIRTPUT_Last;
-+ Input_Events at 0 range Curses_Constants.TRACE_IEVENT_First
-+ .. Curses_Constants.TRACE_IEVENT_Last;
-+ TTY_State at 0 range Curses_Constants.TRACE_BITS_First
-+ .. Curses_Constants.TRACE_BITS_Last;
-+ Internal_Calls at 0 range Curses_Constants.TRACE_ICALLS_First
-+ .. Curses_Constants.TRACE_ICALLS_Last;
-+ Character_Calls at 0 range Curses_Constants.TRACE_CCALLS_First
-+ .. Curses_Constants.TRACE_CCALLS_Last;
-+ Termcap_TermInfo at 0 range Curses_Constants.TRACE_DATABASE_First
-+ .. Curses_Constants.TRACE_DATABASE_Last;
-+ Attribute_Color at 0 range Curses_Constants.TRACE_ATTRS_First
-+ .. Curses_Constants.TRACE_ATTRS_Last;
-+ end record;
-+ pragma Warnings (Off);
-+ for Trace_Attribute_Set'Size use Curses_Constants.Trace_Size;
- pragma Warnings (On);
-
- Trace_Disable : constant Trace_Attribute_Set := (others => False);
-Index: Ada95/gen/terminal_interface-curses.adb.m4
---- ncurses-5.9/Ada95/gen/terminal_interface-curses.adb.m4 2011-03-22 23:02:14.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/gen/terminal_interface-curses.adb.m4 2014-05-24 21:31:05.000000000 +0000
-@@ -9,7 +9,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -37,8 +37,8 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.8 $
---- $Date: 2011/03/22 23:02:14 $
-+-- $Revision: 1.14 $
-+-- $Date: 2014/05/24 21:31:05 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with System;
-@@ -151,10 +151,10 @@
- Ch : Attributed_Character)
- is
- function Waddch (W : Window;
-- Ch : C_Chtype) return C_Int;
-+ Ch : Attributed_Character) return C_Int;
- pragma Import (C, Waddch, "waddch");
- begin
-- if Waddch (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then
-+ if Waddch (Win, Ch) = Curses_Err then
- raise Curses_Exception;
- end if;
- end Add;
-@@ -178,12 +178,13 @@
- function mvwaddch (W : Window;
- Y : C_Int;
- X : C_Int;
-- Ch : C_Chtype) return C_Int;
-+ Ch : Attributed_Character) return C_Int;
- pragma Import (C, mvwaddch, "mvwaddch");
- begin
- if mvwaddch (Win, C_Int (Line),
- C_Int (Column),
-- AttrChar_To_Chtype (Ch)) = Curses_Err then
-+ Ch) = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Add;
-@@ -208,10 +209,10 @@
- Ch : Attributed_Character)
- is
- function Wechochar (W : Window;
-- Ch : C_Chtype) return C_Int;
-+ Ch : Attributed_Character) return C_Int;
- pragma Import (C, Wechochar, "wechochar");
- begin
-- if Wechochar (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then
-+ if Wechochar (Win, Ch) = Curses_Err then
- raise Curses_Exception;
- end if;
- end Add_With_Immediate_Echo;
-@@ -419,7 +420,8 @@
- Txt (Str'Length) := Default_Character;
- if Waddchnstr (Win,
- Txt,
-- C_Int (Len)) = Curses_Err then
-+ C_Int (Len)) = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Add;
-@@ -448,26 +450,25 @@
- Lower_Right_Corner_Symbol : Attributed_Character := Default_Character)
- is
- function Wborder (W : Window;
-- LS : C_Chtype;
-- RS : C_Chtype;
-- TS : C_Chtype;
-- BS : C_Chtype;
-- ULC : C_Chtype;
-- URC : C_Chtype;
-- LLC : C_Chtype;
-- LRC : C_Chtype) return C_Int;
-+ LS : Attributed_Character;
-+ RS : Attributed_Character;
-+ TS : Attributed_Character;
-+ BS : Attributed_Character;
-+ ULC : Attributed_Character;
-+ URC : Attributed_Character;
-+ LLC : Attributed_Character;
-+ LRC : Attributed_Character) return C_Int;
- pragma Import (C, Wborder, "wborder");
- begin
- if Wborder (Win,
-- AttrChar_To_Chtype (Left_Side_Symbol),
-- AttrChar_To_Chtype (Right_Side_Symbol),
-- AttrChar_To_Chtype (Top_Side_Symbol),
-- AttrChar_To_Chtype (Bottom_Side_Symbol),
-- AttrChar_To_Chtype (Upper_Left_Corner_Symbol),
-- AttrChar_To_Chtype (Upper_Right_Corner_Symbol),
-- AttrChar_To_Chtype (Lower_Left_Corner_Symbol),
-- AttrChar_To_Chtype (Lower_Right_Corner_Symbol)
-- ) = Curses_Err
-+ Left_Side_Symbol,
-+ Right_Side_Symbol,
-+ Top_Side_Symbol,
-+ Bottom_Side_Symbol,
-+ Upper_Left_Corner_Symbol,
-+ Upper_Right_Corner_Symbol,
-+ Lower_Left_Corner_Symbol,
-+ Lower_Right_Corner_Symbol) = Curses_Err
- then
- raise Curses_Exception;
- end if;
-@@ -490,13 +491,14 @@
- Line_Symbol : Attributed_Character := Default_Character)
- is
- function Whline (W : Window;
-- Ch : C_Chtype;
-+ Ch : Attributed_Character;
- Len : C_Int) return C_Int;
- pragma Import (C, Whline, "whline");
- begin
- if Whline (Win,
-- AttrChar_To_Chtype (Line_Symbol),
-- C_Int (Line_Size)) = Curses_Err then
-+ Line_Symbol,
-+ C_Int (Line_Size)) = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Horizontal_Line;
-@@ -507,13 +509,14 @@
- Line_Symbol : Attributed_Character := Default_Character)
- is
- function Wvline (W : Window;
-- Ch : C_Chtype;
-+ Ch : Attributed_Character;
- Len : C_Int) return C_Int;
- pragma Import (C, Wvline, "wvline");
- begin
- if Wvline (Win,
-- AttrChar_To_Chtype (Line_Symbol),
-- C_Int (Line_Size)) = Curses_Err then
-+ Line_Symbol,
-+ C_Int (Line_Size)) = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Vertical_Line;
-@@ -611,10 +614,10 @@
- On : Boolean := True)
- is
- function Wattron (Win : Window;
-- C_Attr : C_AttrType) return C_Int;
-+ C_Attr : Attributed_Character) return C_Int;
- pragma Import (C, Wattron, "wattr_on");
- function Wattroff (Win : Window;
-- C_Attr : C_AttrType) return C_Int;
-+ C_Attr : Attributed_Character) return C_Int;
- pragma Import (C, Wattroff, "wattr_off");
- -- In Ada we use the On Boolean to control whether or not we want to
- -- switch on or off the attributes in the set.
-@@ -624,9 +627,9 @@
- Attr => Attr);
- begin
- if On then
-- Err := Wattron (Win, AttrChar_To_AttrType (AC));
-+ Err := Wattron (Win, AC);
- else
-- Err := Wattroff (Win, AttrChar_To_AttrType (AC));
-+ Err := Wattroff (Win, AC);
- end if;
- if Err = Curses_Err then
- raise Curses_Exception;
-@@ -639,14 +642,13 @@
- Color : Color_Pair := Color_Pair'First)
- is
- function Wattrset (Win : Window;
-- C_Attr : C_AttrType) return C_Int;
-+ C_Attr : Attributed_Character) return C_Int;
- pragma Import (C, Wattrset, "wattrset"); -- ??? wattr_set
- begin
-- if Wattrset (Win,
-- AttrChar_To_AttrType (Attributed_Character'
-- (Ch => Character'First,
-- Color => Color,
-- Attr => Attr))) = Curses_Err then
-+ if Wattrset (Win, (Ch => Character'First,
-+ Color => Color,
-+ Attr => Attr)) = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Set_Character_Attributes;
-@@ -655,20 +657,18 @@
- return Character_Attribute_Set
- is
- function Wattrget (Win : Window;
-- Atr : access C_AttrType;
-+ Atr : access Attributed_Character;
- Col : access C_Short;
- Opt : System.Address) return C_Int;
- pragma Import (C, Wattrget, "wattr_get");
-
-- Attr : aliased C_AttrType;
-+ Attr : aliased Attributed_Character;
- Col : aliased C_Short;
- Res : constant C_Int := Wattrget (Win, Attr'Access, Col'Access,
- System.Null_Address);
-- Ch : Attributed_Character;
- begin
- if Res = Curses_Ok then
-- Ch := AttrType_To_AttrChar (Attr);
-- return Ch.Attr;
-+ return Attr.Attr;
- else
- raise Curses_Exception;
- end if;
-@@ -678,20 +678,18 @@
- return Color_Pair
- is
- function Wattrget (Win : Window;
-- Atr : access C_AttrType;
-+ Atr : access Attributed_Character;
- Col : access C_Short;
- Opt : System.Address) return C_Int;
- pragma Import (C, Wattrget, "wattr_get");
-
-- Attr : aliased C_AttrType;
-+ Attr : aliased Attributed_Character;
- Col : aliased C_Short;
- Res : constant C_Int := Wattrget (Win, Attr'Access, Col'Access,
- System.Null_Address);
-- Ch : Attributed_Character;
- begin
- if Res = Curses_Ok then
-- Ch := AttrType_To_AttrChar (Attr);
-- return Ch.Color;
-+ return Attr.Color;
- else
- raise Curses_Exception;
- end if;
-@@ -707,7 +705,8 @@
- begin
- if Wset_Color (Win,
- C_Short (Pair),
-- C_Void_Ptr (System.Null_Address)) = Curses_Err then
-+ C_Void_Ptr (System.Null_Address)) = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Set_Color;
-@@ -720,17 +719,19 @@
- is
- function Wchgat (Win : Window;
- Cnt : C_Int;
-- Attr : C_AttrType;
-+ Attr : Attributed_Character;
- Color : C_Short;
- Opts : System.Address := System.Null_Address)
- return C_Int;
- pragma Import (C, Wchgat, "wchgat");
--
-- Ch : constant Attributed_Character :=
-- (Ch => Character'First, Color => Color_Pair'First, Attr => Attr);
- begin
-- if Wchgat (Win, C_Int (Count), AttrChar_To_AttrType (Ch),
-- C_Short (Color)) = Curses_Err then
-+ if Wchgat (Win,
-+ C_Int (Count),
-+ (Ch => Character'First,
-+ Color => Color_Pair'First,
-+ Attr => Attr),
-+ C_Short (Color)) = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Change_Attributes;
-@@ -938,7 +939,8 @@
- pragma Import (C, Notimeout, "notimeout");
- begin
- if Notimeout (Win, Curses_Bool (Boolean'Pos (Timer_Off)))
-- = Curses_Err then
-+ = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Set_Escape_Timer_Mode;
-@@ -1051,7 +1053,8 @@
- pragma Import (C, Wsetscrreg, "wsetscrreg");
- begin
- if Wsetscrreg (Win, C_Int (Top_Line), C_Int (Bottom_Line))
-- = Curses_Err then
-+ = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Set_Scroll_Region;
-@@ -1108,7 +1111,8 @@
- begin
- if Wredrawln (Win,
- C_Int (Begin_Line),
-- C_Int (Line_Count)) = Curses_Err then
-+ C_Int (Line_Count)) = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Redraw;
-@@ -1158,20 +1162,21 @@
- (Win : Window := Standard_Window;
- Ch : Attributed_Character)
- is
-- procedure WBackground (W : Window; Ch : C_Chtype);
-+ procedure WBackground (W : Window; Ch : Attributed_Character);
- pragma Import (C, WBackground, "wbkgdset");
- begin
-- WBackground (Win, AttrChar_To_Chtype (Ch));
-+ WBackground (Win, Ch);
- end Set_Background;
-
- procedure Change_Background
- (Win : Window := Standard_Window;
- Ch : Attributed_Character)
- is
-- function WChangeBkgd (W : Window; Ch : C_Chtype) return C_Int;
-+ function WChangeBkgd (W : Window; Ch : Attributed_Character)
-+ return C_Int;
- pragma Import (C, WChangeBkgd, "wbkgd");
- begin
-- if WChangeBkgd (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then
-+ if WChangeBkgd (Win, Ch) = Curses_Err then
- raise Curses_Exception;
- end if;
- end Change_Background;
-@@ -1179,10 +1184,10 @@
- function Get_Background (Win : Window := Standard_Window)
- return Attributed_Character
- is
-- function Wgetbkgd (Win : Window) return C_Chtype;
-+ function Wgetbkgd (Win : Window) return Attributed_Character;
- pragma Import (C, Wgetbkgd, "getbkgd");
- begin
-- return Chtype_To_AttrChar (Wgetbkgd (Win));
-+ return Wgetbkgd (Win);
- end Get_Background;
- ------------------------------------------------------------------------------
- procedure Change_Lines_Status (Win : Window := Standard_Window;
-@@ -1197,7 +1202,8 @@
- pragma Import (C, Wtouchln, "wtouchln");
- begin
- if Wtouchln (Win, C_Int (Start), C_Int (Count),
-- C_Int (Boolean'Pos (State))) = Curses_Err then
-+ C_Int (Boolean'Pos (State))) = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Change_Lines_Status;
-@@ -1208,7 +1214,7 @@
- X : Column_Position;
- begin
- Get_Size (Win, Y, X);
-- pragma Unreferenced (X);
-+ pragma Warnings (Off, X); -- unreferenced
- Change_Lines_Status (Win, 0, Positive (Y), True);
- end Touch;
-
-@@ -1218,7 +1224,7 @@
- X : Column_Position;
- begin
- Get_Size (Win, Y, X);
-- pragma Unreferenced (X);
-+ pragma Warnings (Off, X); -- unreferenced
- Change_Lines_Status (Win, 0, Positive (Y), False);
- end Untouch;
-
-@@ -1288,7 +1294,8 @@
- C_Int (Destination_Bottom_Row),
- C_Int (Destination_Right_Column),
- Boolean'Pos (Non_Destructive_Mode)
-- ) = Curses_Err then
-+ ) = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Copy;
-@@ -1491,7 +1498,8 @@
- C_Int (Destination_Top_Row),
- C_Int (Destination_Left_Column),
- C_Int (Destination_Bottom_Row),
-- C_Int (Destination_Right_Column)) = Curses_Err then
-+ C_Int (Destination_Right_Column)) = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Refresh;
-@@ -1521,7 +1529,8 @@
- C_Int (Destination_Top_Row),
- C_Int (Destination_Left_Column),
- C_Int (Destination_Bottom_Row),
-- C_Int (Destination_Right_Column)) = Curses_Err then
-+ C_Int (Destination_Right_Column)) = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Refresh_Without_Update;
-@@ -1530,11 +1539,11 @@
- (Pad : Window;
- Ch : Attributed_Character)
- is
-- function Pechochar (Pad : Window; Ch : C_Chtype)
-+ function Pechochar (Pad : Window; Ch : Attributed_Character)
- return C_Int;
- pragma Import (C, Pechochar, "pechochar");
- begin
-- if Pechochar (Pad, AttrChar_To_Chtype (Ch)) = Curses_Err then
-+ if Pechochar (Pad, Ch) = Curses_Err then
- raise Curses_Exception;
- end if;
- end Add_Character_To_Pad_And_Echo_It;
-@@ -1592,10 +1601,10 @@
- function Peek (Win : Window := Standard_Window)
- return Attributed_Character
- is
-- function Winch (Win : Window) return C_Chtype;
-+ function Winch (Win : Window) return Attributed_Character;
- pragma Import (C, Winch, "winch");
- begin
-- return Chtype_To_AttrChar (Winch (Win));
-+ return Winch (Win);
- end Peek;
-
- function Peek
-@@ -1605,19 +1614,19 @@
- is
- function Mvwinch (Win : Window;
- Lin : C_Int;
-- Col : C_Int) return C_Chtype;
-+ Col : C_Int) return Attributed_Character;
- pragma Import (C, Mvwinch, "mvwinch");
- begin
-- return Chtype_To_AttrChar (Mvwinch (Win, C_Int (Line), C_Int (Column)));
-+ return Mvwinch (Win, C_Int (Line), C_Int (Column));
- end Peek;
- ------------------------------------------------------------------------------
- procedure Insert (Win : Window := Standard_Window;
- Ch : Attributed_Character)
- is
-- function Winsch (Win : Window; Ch : C_Chtype) return C_Int;
-+ function Winsch (Win : Window; Ch : Attributed_Character) return C_Int;
- pragma Import (C, Winsch, "winsch");
- begin
-- if Winsch (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then
-+ if Winsch (Win, Ch) = Curses_Err then
- raise Curses_Exception;
- end if;
- end Insert;
-@@ -1631,13 +1640,14 @@
- function Mvwinsch (Win : Window;
- Lin : C_Int;
- Col : C_Int;
-- Ch : C_Chtype) return C_Int;
-+ Ch : Attributed_Character) return C_Int;
- pragma Import (C, Mvwinsch, "mvwinsch");
- begin
- if Mvwinsch (Win,
- C_Int (Line),
- C_Int (Column),
-- AttrChar_To_Chtype (Ch)) = Curses_Err then
-+ Ch) = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Insert;
-@@ -1679,7 +1689,8 @@
- begin
- To_C (Str, Txt, Length);
- if Mvwinsnstr (Win, C_Int (Line), C_Int (Column), Txt, C_Int (Len))
-- = Curses_Err then
-+ = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Insert;
-@@ -1840,7 +1851,8 @@
- begin
- To_C (Text, Txt, Len);
- if Slk_Set (C_Int (Label), Txt,
-- C_Int (Label_Justification'Pos (Fmt))) = Curses_Err then
-+ C_Int (Label_Justification'Pos (Fmt))) = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Set_Soft_Label_Key;
-@@ -1916,9 +1928,9 @@
- (Attr : Character_Attribute_Set;
- On : Boolean := True)
- is
-- function Slk_Attron (Ch : C_Chtype) return C_Int;
-+ function Slk_Attron (Ch : Attributed_Character) return C_Int;
- pragma Import (C, Slk_Attron, "slk_attron");
-- function Slk_Attroff (Ch : C_Chtype) return C_Int;
-+ function Slk_Attroff (Ch : Attributed_Character) return C_Int;
- pragma Import (C, Slk_Attroff, "slk_attroff");
-
- Err : C_Int;
-@@ -1927,9 +1939,9 @@
- Color => Color_Pair'First);
- begin
- if On then
-- Err := Slk_Attron (AttrChar_To_Chtype (Ch));
-+ Err := Slk_Attron (Ch);
- else
-- Err := Slk_Attroff (AttrChar_To_Chtype (Ch));
-+ Err := Slk_Attroff (Ch);
- end if;
- if Err = Curses_Err then
- raise Curses_Exception;
-@@ -1940,36 +1952,36 @@
- (Attr : Character_Attribute_Set := Normal_Video;
- Color : Color_Pair := Color_Pair'First)
- is
-- function Slk_Attrset (Ch : C_Chtype) return C_Int;
-+ function Slk_Attrset (Ch : Attributed_Character) return C_Int;
- pragma Import (C, Slk_Attrset, "slk_attrset");
-
- Ch : constant Attributed_Character := (Ch => Character'First,
- Attr => Attr,
- Color => Color);
- begin
-- if Slk_Attrset (AttrChar_To_Chtype (Ch)) = Curses_Err then
-+ if Slk_Attrset (Ch) = Curses_Err then
- raise Curses_Exception;
- end if;
- end Set_Soft_Label_Key_Attributes;
-
- function Get_Soft_Label_Key_Attributes return Character_Attribute_Set
- is
-- function Slk_Attr return C_Chtype;
-+ function Slk_Attr return Attributed_Character;
- pragma Import (C, Slk_Attr, "slk_attr");
-
-- Attr : constant C_Chtype := Slk_Attr;
-+ Attr : constant Attributed_Character := Slk_Attr;
- begin
-- return Chtype_To_AttrChar (Attr).Attr;
-+ return Attr.Attr;
- end Get_Soft_Label_Key_Attributes;
-
- function Get_Soft_Label_Key_Attributes return Color_Pair
- is
-- function Slk_Attr return C_Chtype;
-+ function Slk_Attr return Attributed_Character;
- pragma Import (C, Slk_Attr, "slk_attr");
-
-- Attr : constant C_Chtype := Slk_Attr;
-+ Attr : constant Attributed_Character := Slk_Attr;
- begin
-- return Chtype_To_AttrChar (Attr).Color;
-+ return Attr.Color;
- end Get_Soft_Label_Key_Attributes;
-
- procedure Set_Soft_Label_Key_Color (Pair : Color_Pair)
-@@ -1991,7 +2003,8 @@
- pragma Import (C, Keyok, "keyok");
- begin
- if Keyok (C_Int (Key), Curses_Bool (Boolean'Pos (Enable)))
-- = Curses_Err then
-+ = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Enable_Key;
-@@ -2015,18 +2028,18 @@
- procedure Un_Control (Ch : Attributed_Character;
- Str : out String)
- is
-- function Unctrl (Ch : C_Chtype) return chars_ptr;
-+ function Unctrl (Ch : Attributed_Character) return chars_ptr;
- pragma Import (C, Unctrl, "unctrl");
- begin
-- Fill_String (Unctrl (AttrChar_To_Chtype (Ch)), Str);
-+ Fill_String (Unctrl (Ch), Str);
- end Un_Control;
-
- function Un_Control (Ch : Attributed_Character) return String
- is
-- function Unctrl (Ch : C_Chtype) return chars_ptr;
-+ function Unctrl (Ch : Attributed_Character) return chars_ptr;
- pragma Import (C, Unctrl, "unctrl");
- begin
-- return Fill_String (Unctrl (AttrChar_To_Chtype (Ch)));
-+ return Fill_String (Unctrl (Ch));
- end Un_Control;
-
- procedure Delay_Output (Msecs : Natural)
-@@ -2099,10 +2112,10 @@
-
- function Supported_Attributes return Character_Attribute_Set
- is
-- function Termattrs return C_Chtype;
-+ function Termattrs return Attributed_Character;
- pragma Import (C, Termattrs, "termattrs");
-
-- Ch : constant Attributed_Character := Chtype_To_AttrChar (Termattrs);
-+ Ch : constant Attributed_Character := Termattrs;
- begin
- return Ch.Attr;
- end Supported_Attributes;
-@@ -2152,11 +2165,13 @@
- raise Constraint_Error;
- end if;
- if Integer (Fore) >= Number_Of_Colors or else
-- Integer (Back) >= Number_Of_Colors then
-+ Integer (Back) >= Number_Of_Colors
-+ then
- raise Constraint_Error;
- end if;
- if Initpair (C_Short (Pair), C_Short (Fore), C_Short (Back))
-- = Curses_Err then
-+ = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Init_Pair;
-@@ -2205,7 +2220,8 @@
- pragma Import (C, Initcolor, "init_color");
- begin
- if Initcolor (C_Short (Color), C_Short (Red), C_Short (Green),
-- C_Short (Blue)) = Curses_Err then
-+ C_Short (Blue)) = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Init_Color;
-@@ -2236,7 +2252,8 @@
- R, G, B : aliased C_Short;
- begin
- if Colorcontent (C_Short (Color), R'Access, G'Access, B'Access) =
-- Curses_Err then
-+ Curses_Err
-+ then
- raise Curses_Exception;
- else
- Red := RGB_Value (R);
-@@ -2337,7 +2354,46 @@
- end if;
- end Nap_Milli_Seconds;
- ------------------------------------------------------------------------------
--include(`Public_Variables')
-+ function Lines return Line_Count
-+ is
-+ function LINES_As_Function return Interfaces.C.int;
-+ pragma Import (C, LINES_As_Function, "LINES_as_function");
-+ begin
-+ return Line_Count (LINES_As_Function);
-+ end Lines;
-+
-+ function Columns return Column_Count
-+ is
-+ function COLS_As_Function return Interfaces.C.int;
-+ pragma Import (C, COLS_As_Function, "COLS_as_function");
-+ begin
-+ return Column_Count (COLS_As_Function);
-+ end Columns;
-+
-+ function Tab_Size return Natural
-+ is
-+ function TABSIZE_As_Function return Interfaces.C.int;
-+ pragma Import (C, TABSIZE_As_Function, "TABSIZE_as_function");
-+
-+ begin
-+ return Natural (TABSIZE_As_Function);
-+ end Tab_Size;
-+
-+ function Number_Of_Colors return Natural
-+ is
-+ function COLORS_As_Function return Interfaces.C.int;
-+ pragma Import (C, COLORS_As_Function, "COLORS_as_function");
-+ begin
-+ return Natural (COLORS_As_Function);
-+ end Number_Of_Colors;
-+
-+ function Number_Of_Color_Pairs return Natural
-+ is
-+ function COLOR_PAIRS_As_Function return Interfaces.C.int;
-+ pragma Import (C, COLOR_PAIRS_As_Function, "COLOR_PAIRS_as_function");
-+ begin
-+ return Natural (COLOR_PAIRS_As_Function);
-+ end Number_Of_Color_Pairs;
- ------------------------------------------------------------------------------
- procedure Transform_Coordinates
- (W : Window := Standard_Window;
-@@ -2493,7 +2549,8 @@
- begin
- if wresize (Win,
- C_Int (Number_Of_Lines),
-- C_Int (Number_Of_Columns)) = Curses_Err then
-+ C_Int (Number_Of_Columns)) = Curses_Err
-+ then
- raise Curses_Exception;
- end if;
- end Resize;
-Index: Ada95/gen/terminal_interface-curses.ads.m4
---- ncurses-5.9/Ada95/gen/terminal_interface-curses.ads.m4 2011-03-19 23:05:56.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/gen/terminal_interface-curses.ads.m4 2014-05-24 21:31:57.000000000 +0000
-@@ -9,7 +9,7 @@
- -- S P E C --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -37,18 +37,23 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.44 $
---- $Date: 2011/03/19 23:05:56 $
-+-- $Revision: 1.47 $
-+-- $Date: 2014/05/24 21:31:57 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
--include(`Base_Defs')
- with System.Storage_Elements;
- with Interfaces.C; -- We need this for some assertions.
-
-+with Terminal_Interface.Curses_Constants;
-+
- package Terminal_Interface.Curses is
- pragma Preelaborate (Terminal_Interface.Curses);
--include(`Linker_Options')
--include(`Version_Info')
-+ pragma Linker_Options ("-lncurses" & Curses_Constants.DFT_ARG_SUFFIX);
-+
-+ Major_Version : constant := Curses_Constants.NCURSES_VERSION_MAJOR;
-+ Minor_Version : constant := Curses_Constants.NCURSES_VERSION_MINOR;
-+ NC_Version : String renames Curses_Constants.Version;
-+
- type Window is private;
- Null_Window : constant Window;
-
-@@ -65,24 +70,315 @@
- -- request codes.
-
- -- FIXME: The "-1" should be Curses_Err
-- subtype Real_Key_Code is Key_Code range -1 .. M4_KEY_MAX;
-+ subtype Real_Key_Code is Key_Code range -1 .. Curses_Constants.KEY_MAX;
- -- This are the codes that potentially represent a real keystroke.
- -- Not all codes may be possible on a specific terminal. To check the
- -- availability of a special key, the Has_Key function is provided.
-
- subtype Special_Key_Code is Real_Key_Code
-- range M4_SPECIAL_FIRST .. Real_Key_Code'Last;
-+ range Curses_Constants. KEY_MIN - 1 .. Real_Key_Code'Last;
- -- Type for a function- or special key number
-
- subtype Normal_Key_Code is Real_Key_Code range
- Character'Pos (Character'First) .. Character'Pos (Character'Last);
- -- This are the codes for regular (incl. non-graphical) characters.
-
-+ -- For those who like to use the original key names we produce them were
-+ -- they differ from the original.
-+
- -- Constants for function- and special keys
-- --
-- Key_None : constant Special_Key_Code := M4_SPECIAL_FIRST;
--include(`Key_Definitions')
-- Key_Max : constant Special_Key_Code
-+ Key_None : constant Special_Key_Code
-+ := Curses_Constants.KEY_MIN - 1;
-+ Key_Min : constant Special_Key_Code
-+ := Curses_Constants.KEY_MIN;
-+ Key_Break : constant Special_Key_Code
-+ := Curses_Constants.KEY_BREAK;
-+ KEY_DOWN : constant Special_Key_Code
-+ := Curses_Constants.KEY_DOWN;
-+ Key_Cursor_Down : Special_Key_Code renames KEY_DOWN;
-+ KEY_UP : constant Special_Key_Code
-+ := Curses_Constants.KEY_UP;
-+ Key_Cursor_Up : Special_Key_Code renames KEY_UP;
-+ KEY_LEFT : constant Special_Key_Code
-+ := Curses_Constants.KEY_LEFT;
-+ Key_Cursor_Left : Special_Key_Code renames KEY_LEFT;
-+ KEY_RIGHT : constant Special_Key_Code
-+ := Curses_Constants.KEY_RIGHT;
-+ Key_Cursor_Right : Special_Key_Code renames KEY_RIGHT;
-+ Key_Home : constant Special_Key_Code
-+ := Curses_Constants.KEY_HOME;
-+ Key_Backspace : constant Special_Key_Code
-+ := Curses_Constants.KEY_BACKSPACE;
-+ Key_F0 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F0;
-+ Key_F1 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F1;
-+ Key_F2 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F2;
-+ Key_F3 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F3;
-+ Key_F4 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F4;
-+ Key_F5 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F5;
-+ Key_F6 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F6;
-+ Key_F7 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F7;
-+ Key_F8 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F8;
-+ Key_F9 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F9;
-+ Key_F10 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F10;
-+ Key_F11 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F11;
-+ Key_F12 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F12;
-+ Key_F13 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F13;
-+ Key_F14 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F14;
-+ Key_F15 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F15;
-+ Key_F16 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F16;
-+ Key_F17 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F17;
-+ Key_F18 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F18;
-+ Key_F19 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F19;
-+ Key_F20 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F20;
-+ Key_F21 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F21;
-+ Key_F22 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F22;
-+ Key_F23 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F23;
-+ Key_F24 : constant Special_Key_Code
-+ := Curses_Constants.KEY_F24;
-+ KEY_DL : constant Special_Key_Code
-+ := Curses_Constants.KEY_DL;
-+ Key_Delete_Line : Special_Key_Code renames KEY_DL;
-+ KEY_IL : constant Special_Key_Code
-+ := Curses_Constants.KEY_IL;
-+ Key_Insert_Line : Special_Key_Code renames KEY_IL;
-+ KEY_DC : constant Special_Key_Code
-+ := Curses_Constants.KEY_DC;
-+ Key_Delete_Char : Special_Key_Code renames KEY_DC;
-+ KEY_IC : constant Special_Key_Code
-+ := Curses_Constants.KEY_IC;
-+ Key_Insert_Char : Special_Key_Code renames KEY_IC;
-+ KEY_EIC : constant Special_Key_Code
-+ := Curses_Constants.KEY_EIC;
-+ Key_Exit_Insert_Mode : Special_Key_Code renames KEY_EIC;
-+ KEY_CLEAR : constant Special_Key_Code
-+ := Curses_Constants.KEY_CLEAR;
-+ Key_Clear_Screen : Special_Key_Code renames KEY_CLEAR;
-+ KEY_EOS : constant Special_Key_Code
-+ := Curses_Constants.KEY_EOS;
-+ Key_Clear_End_Of_Screen : Special_Key_Code renames KEY_EOS;
-+ KEY_EOL : constant Special_Key_Code
-+ := Curses_Constants.KEY_EOL;
-+ Key_Clear_End_Of_Line : Special_Key_Code renames KEY_EOL;
-+ KEY_SF : constant Special_Key_Code
-+ := Curses_Constants.KEY_SF;
-+ Key_Scroll_1_Forward : Special_Key_Code renames KEY_SF;
-+ KEY_SR : constant Special_Key_Code
-+ := Curses_Constants.KEY_SR;
-+ Key_Scroll_1_Backward : Special_Key_Code renames KEY_SR;
-+ KEY_NPAGE : constant Special_Key_Code
-+ := Curses_Constants.KEY_NPAGE;
-+ Key_Next_Page : Special_Key_Code renames KEY_NPAGE;
-+ KEY_PPAGE : constant Special_Key_Code
-+ := Curses_Constants.KEY_PPAGE;
-+ Key_Previous_Page : Special_Key_Code renames KEY_PPAGE;
-+ KEY_STAB : constant Special_Key_Code
-+ := Curses_Constants.KEY_STAB;
-+ Key_Set_Tab : Special_Key_Code renames KEY_STAB;
-+ KEY_CTAB : constant Special_Key_Code
-+ := Curses_Constants.KEY_CTAB;
-+ Key_Clear_Tab : Special_Key_Code renames KEY_CTAB;
-+ KEY_CATAB : constant Special_Key_Code
-+ := Curses_Constants.KEY_CATAB;
-+ Key_Clear_All_Tabs : Special_Key_Code renames KEY_CATAB;
-+ KEY_ENTER : constant Special_Key_Code
-+ := Curses_Constants.KEY_ENTER;
-+ Key_Enter_Or_Send : Special_Key_Code renames KEY_ENTER;
-+ KEY_SRESET : constant Special_Key_Code
-+ := Curses_Constants.KEY_SRESET;
-+ Key_Soft_Reset : Special_Key_Code renames KEY_SRESET;
-+ Key_Reset : constant Special_Key_Code
-+ := Curses_Constants.KEY_RESET;
-+ Key_Print : constant Special_Key_Code
-+ := Curses_Constants.KEY_PRINT;
-+ KEY_LL : constant Special_Key_Code
-+ := Curses_Constants.KEY_LL;
-+ Key_Bottom : Special_Key_Code renames KEY_LL;
-+ KEY_A1 : constant Special_Key_Code
-+ := Curses_Constants.KEY_A1;
-+ Key_Upper_Left_Of_Keypad : Special_Key_Code renames KEY_A1;
-+ KEY_A3 : constant Special_Key_Code
-+ := Curses_Constants.KEY_A3;
-+ Key_Upper_Right_Of_Keypad : Special_Key_Code renames KEY_A3;
-+ KEY_B2 : constant Special_Key_Code
-+ := Curses_Constants.KEY_B2;
-+ Key_Center_Of_Keypad : Special_Key_Code renames KEY_B2;
-+ KEY_C1 : constant Special_Key_Code
-+ := Curses_Constants.KEY_C1;
-+ Key_Lower_Left_Of_Keypad : Special_Key_Code renames KEY_C1;
-+ KEY_C3 : constant Special_Key_Code
-+ := Curses_Constants.KEY_C3;
-+ Key_Lower_Right_Of_Keypad : Special_Key_Code renames KEY_C3;
-+ KEY_BTAB : constant Special_Key_Code
-+ := Curses_Constants.KEY_BTAB;
-+ Key_Back_Tab : Special_Key_Code renames KEY_BTAB;
-+ KEY_BEG : constant Special_Key_Code
-+ := Curses_Constants.KEY_BEG;
-+ Key_Beginning : Special_Key_Code renames KEY_BEG;
-+ Key_Cancel : constant Special_Key_Code
-+ := Curses_Constants.KEY_CANCEL;
-+ Key_Close : constant Special_Key_Code
-+ := Curses_Constants.KEY_CLOSE;
-+ Key_Command : constant Special_Key_Code
-+ := Curses_Constants.KEY_COMMAND;
-+ Key_Copy : constant Special_Key_Code
-+ := Curses_Constants.KEY_COPY;
-+ Key_Create : constant Special_Key_Code
-+ := Curses_Constants.KEY_CREATE;
-+ Key_End : constant Special_Key_Code
-+ := Curses_Constants.KEY_END;
-+ Key_Exit : constant Special_Key_Code
-+ := Curses_Constants.KEY_EXIT;
-+ Key_Find : constant Special_Key_Code
-+ := Curses_Constants.KEY_FIND;
-+ Key_Help : constant Special_Key_Code
-+ := Curses_Constants.KEY_HELP;
-+ Key_Mark : constant Special_Key_Code
-+ := Curses_Constants.KEY_MARK;
-+ Key_Message : constant Special_Key_Code
-+ := Curses_Constants.KEY_MESSAGE;
-+ Key_Move : constant Special_Key_Code
-+ := Curses_Constants.KEY_MOVE;
-+ Key_Next : constant Special_Key_Code
-+ := Curses_Constants.KEY_NEXT;
-+ Key_Open : constant Special_Key_Code
-+ := Curses_Constants.KEY_OPEN;
-+ Key_Options : constant Special_Key_Code
-+ := Curses_Constants.KEY_OPTIONS;
-+ Key_Previous : constant Special_Key_Code
-+ := Curses_Constants.KEY_PREVIOUS;
-+ Key_Redo : constant Special_Key_Code
-+ := Curses_Constants.KEY_REDO;
-+ Key_Reference : constant Special_Key_Code
-+ := Curses_Constants.KEY_REFERENCE;
-+ Key_Refresh : constant Special_Key_Code
-+ := Curses_Constants.KEY_REFRESH;
-+ Key_Replace : constant Special_Key_Code
-+ := Curses_Constants.KEY_REPLACE;
-+ Key_Restart : constant Special_Key_Code
-+ := Curses_Constants.KEY_RESTART;
-+ Key_Resume : constant Special_Key_Code
-+ := Curses_Constants.KEY_RESUME;
-+ Key_Save : constant Special_Key_Code
-+ := Curses_Constants.KEY_SAVE;
-+ KEY_SBEG : constant Special_Key_Code
-+ := Curses_Constants.KEY_SBEG;
-+ Key_Shift_Begin : Special_Key_Code renames KEY_SBEG;
-+ KEY_SCANCEL : constant Special_Key_Code
-+ := Curses_Constants.KEY_SCANCEL;
-+ Key_Shift_Cancel : Special_Key_Code renames KEY_SCANCEL;
-+ KEY_SCOMMAND : constant Special_Key_Code
-+ := Curses_Constants.KEY_SCOMMAND;
-+ Key_Shift_Command : Special_Key_Code renames KEY_SCOMMAND;
-+ KEY_SCOPY : constant Special_Key_Code
-+ := Curses_Constants.KEY_SCOPY;
-+ Key_Shift_Copy : Special_Key_Code renames KEY_SCOPY;
-+ KEY_SCREATE : constant Special_Key_Code
-+ := Curses_Constants.KEY_SCREATE;
-+ Key_Shift_Create : Special_Key_Code renames KEY_SCREATE;
-+ KEY_SDC : constant Special_Key_Code
-+ := Curses_Constants.KEY_SDC;
-+ Key_Shift_Delete_Char : Special_Key_Code renames KEY_SDC;
-+ KEY_SDL : constant Special_Key_Code
-+ := Curses_Constants.KEY_SDL;
-+ Key_Shift_Delete_Line : Special_Key_Code renames KEY_SDL;
-+ Key_Select : constant Special_Key_Code
-+ := Curses_Constants.KEY_SELECT;
-+ KEY_SEND : constant Special_Key_Code
-+ := Curses_Constants.KEY_SEND;
-+ Key_Shift_End : Special_Key_Code renames KEY_SEND;
-+ KEY_SEOL : constant Special_Key_Code
-+ := Curses_Constants.KEY_SEOL;
-+ Key_Shift_Clear_End_Of_Line : Special_Key_Code renames KEY_SEOL;
-+ KEY_SEXIT : constant Special_Key_Code
-+ := Curses_Constants.KEY_SEXIT;
-+ Key_Shift_Exit : Special_Key_Code renames KEY_SEXIT;
-+ KEY_SFIND : constant Special_Key_Code
-+ := Curses_Constants.KEY_SFIND;
-+ Key_Shift_Find : Special_Key_Code renames KEY_SFIND;
-+ KEY_SHELP : constant Special_Key_Code
-+ := Curses_Constants.KEY_SHELP;
-+ Key_Shift_Help : Special_Key_Code renames KEY_SHELP;
-+ KEY_SHOME : constant Special_Key_Code
-+ := Curses_Constants.KEY_SHOME;
-+ Key_Shift_Home : Special_Key_Code renames KEY_SHOME;
-+ KEY_SIC : constant Special_Key_Code
-+ := Curses_Constants.KEY_SIC;
-+ Key_Shift_Insert_Char : Special_Key_Code renames KEY_SIC;
-+ KEY_SLEFT : constant Special_Key_Code
-+ := Curses_Constants.KEY_SLEFT;
-+ Key_Shift_Cursor_Left : Special_Key_Code renames KEY_SLEFT;
-+ KEY_SMESSAGE : constant Special_Key_Code
-+ := Curses_Constants.KEY_SMESSAGE;
-+ Key_Shift_Message : Special_Key_Code renames KEY_SMESSAGE;
-+ KEY_SMOVE : constant Special_Key_Code
-+ := Curses_Constants.KEY_SMOVE;
-+ Key_Shift_Move : Special_Key_Code renames KEY_SMOVE;
-+ KEY_SNEXT : constant Special_Key_Code
-+ := Curses_Constants.KEY_SNEXT;
-+ Key_Shift_Next_Page : Special_Key_Code renames KEY_SNEXT;
-+ KEY_SOPTIONS : constant Special_Key_Code
-+ := Curses_Constants.KEY_SOPTIONS;
-+ Key_Shift_Options : Special_Key_Code renames KEY_SOPTIONS;
-+ KEY_SPREVIOUS : constant Special_Key_Code
-+ := Curses_Constants.KEY_SPREVIOUS;
-+ Key_Shift_Previous_Page : Special_Key_Code renames KEY_SPREVIOUS;
-+ KEY_SPRINT : constant Special_Key_Code
-+ := Curses_Constants.KEY_SPRINT;
-+ Key_Shift_Print : Special_Key_Code renames KEY_SPRINT;
-+ KEY_SREDO : constant Special_Key_Code
-+ := Curses_Constants.KEY_SREDO;
-+ Key_Shift_Redo : Special_Key_Code renames KEY_SREDO;
-+ KEY_SREPLACE : constant Special_Key_Code
-+ := Curses_Constants.KEY_SREPLACE;
-+ Key_Shift_Replace : Special_Key_Code renames KEY_SREPLACE;
-+ KEY_SRIGHT : constant Special_Key_Code
-+ := Curses_Constants.KEY_SRIGHT;
-+ Key_Shift_Cursor_Right : Special_Key_Code renames KEY_SRIGHT;
-+ KEY_SRSUME : constant Special_Key_Code
-+ := Curses_Constants.KEY_SRSUME;
-+ Key_Shift_Resume : Special_Key_Code renames KEY_SRSUME;
-+ KEY_SSAVE : constant Special_Key_Code
-+ := Curses_Constants.KEY_SSAVE;
-+ Key_Shift_Save : Special_Key_Code renames KEY_SSAVE;
-+ KEY_SSUSPEND : constant Special_Key_Code
-+ := Curses_Constants.KEY_SSUSPEND;
-+ Key_Shift_Suspend : Special_Key_Code renames KEY_SSUSPEND;
-+ KEY_SUNDO : constant Special_Key_Code
-+ := Curses_Constants.KEY_SUNDO;
-+ Key_Shift_Undo : Special_Key_Code renames KEY_SUNDO;
-+ Key_Suspend : constant Special_Key_Code
-+ := Curses_Constants.KEY_SUSPEND;
-+ Key_Undo : constant Special_Key_Code
-+ := Curses_Constants.KEY_UNDO;
-+ Key_Mouse : constant Special_Key_Code
-+ := Curses_Constants.KEY_MOUSE;
-+ Key_Resize : constant Special_Key_Code
-+ := Curses_Constants.KEY_RESIZE;
-+ Key_Max : constant Special_Key_Code
- := Special_Key_Code'Last;
-
- subtype User_Key_Code is Key_Code
-@@ -90,12 +386,7 @@
- -- This is reserved for user defined key codes. The range between Key_Max
- -- and the first user code is reserved for subsystems like menu and forms.
-
-- -- For those who like to use the original key names we produce them were
-- -- they differ from the original. Please note that they may differ in
-- -- lower/upper case.
--include(`Old_Keys')dnl
--
--------------------------------------------------------------------------------
-+ --------------------------------------------------------------------------
-
- type Color_Number is range -1 .. Integer (Interfaces.C.short'Last);
- for Color_Number'Size use Interfaces.C.short'Size;
-@@ -104,7 +395,15 @@
- -- (potentially) definable colors. Some of those indices are
- -- predefined (see below), although they may not really exist.
-
--include(`Color_Defs')
-+ Black : constant Color_Number := Curses_Constants.COLOR_BLACK;
-+ Red : constant Color_Number := Curses_Constants.COLOR_RED;
-+ Green : constant Color_Number := Curses_Constants.COLOR_GREEN;
-+ Yellow : constant Color_Number := Curses_Constants.COLOR_YELLOW;
-+ Blue : constant Color_Number := Curses_Constants.COLOR_BLUE;
-+ Magenta : constant Color_Number := Curses_Constants.COLOR_MAGENTA;
-+ Cyan : constant Color_Number := Curses_Constants.COLOR_CYAN;
-+ White : constant Color_Number := Curses_Constants.COLOR_WHITE;
-+
- type RGB_Value is range 0 .. Integer (Interfaces.C.short'Last);
- for RGB_Value'Size use Interfaces.C.short'Size;
- -- Some system may allow to redefine a color by setting RGB values.
-@@ -117,8 +416,73 @@
- -- two colors described by Color_Numbers, one for the foreground and
- -- the other for the background
-
--include(`Character_Attribute_Set_Rep')
-- -- (n)curses uses all but the lowest 16 Bits for Attributes.
-+ type Character_Attribute_Set is
-+ record
-+ Stand_Out : Boolean;
-+ Under_Line : Boolean;
-+ Reverse_Video : Boolean;
-+ Blink : Boolean;
-+ Dim_Character : Boolean;
-+ Bold_Character : Boolean;
-+ Protected_Character : Boolean;
-+ Invisible_Character : Boolean;
-+ Alternate_Character_Set : Boolean;
-+ Horizontal : Boolean;
-+ Left : Boolean;
-+ Low : Boolean;
-+ Right : Boolean;
-+ Top : Boolean;
-+ Vertical : Boolean;
-+ end record;
-+
-+ for Character_Attribute_Set use
-+ record
-+ Stand_Out at 0 range
-+ Curses_Constants.A_STANDOUT_First - Curses_Constants.Attr_First
-+ .. Curses_Constants.A_STANDOUT_Last - Curses_Constants.Attr_First;
-+ Under_Line at 0 range
-+ Curses_Constants.A_UNDERLINE_First - Curses_Constants.Attr_First
-+ .. Curses_Constants.A_UNDERLINE_Last - Curses_Constants.Attr_First;
-+ Reverse_Video at 0 range
-+ Curses_Constants.A_REVERSE_First - Curses_Constants.Attr_First
-+ .. Curses_Constants.A_REVERSE_Last - Curses_Constants.Attr_First;
-+ Blink at 0 range
-+ Curses_Constants.A_BLINK_First - Curses_Constants.Attr_First
-+ .. Curses_Constants.A_BLINK_Last - Curses_Constants.Attr_First;
-+ Dim_Character at 0 range
-+ Curses_Constants.A_DIM_First - Curses_Constants.Attr_First
-+ .. Curses_Constants.A_DIM_Last - Curses_Constants.Attr_First;
-+ Bold_Character at 0 range
-+ Curses_Constants.A_BOLD_First - Curses_Constants.Attr_First
-+ .. Curses_Constants.A_BOLD_Last - Curses_Constants.Attr_First;
-+ Protected_Character at 0 range
-+ Curses_Constants.A_PROTECT_First - Curses_Constants.Attr_First
-+ .. Curses_Constants.A_PROTECT_Last - Curses_Constants.Attr_First;
-+ Invisible_Character at 0 range
-+ Curses_Constants.A_INVIS_First - Curses_Constants.Attr_First
-+ .. Curses_Constants.A_INVIS_Last - Curses_Constants.Attr_First;
-+ Alternate_Character_Set at 0 range
-+ Curses_Constants.A_ALTCHARSET_First - Curses_Constants.Attr_First
-+ .. Curses_Constants.A_ALTCHARSET_Last - Curses_Constants.Attr_First;
-+ Horizontal at 0 range
-+ Curses_Constants.A_HORIZONTAL_First - Curses_Constants.Attr_First
-+ .. Curses_Constants.A_HORIZONTAL_Last - Curses_Constants.Attr_First;
-+ Left at 0 range
-+ Curses_Constants.A_LEFT_First - Curses_Constants.Attr_First
-+ .. Curses_Constants.A_LEFT_Last - Curses_Constants.Attr_First;
-+ Low at 0 range
-+ Curses_Constants.A_LOW_First - Curses_Constants.Attr_First
-+ .. Curses_Constants.A_LOW_Last - Curses_Constants.Attr_First;
-+ Right at 0 range
-+ Curses_Constants.A_RIGHT_First - Curses_Constants.Attr_First
-+ .. Curses_Constants.A_RIGHT_Last - Curses_Constants.Attr_First;
-+ Top at 0 range
-+ Curses_Constants.A_TOP_First - Curses_Constants.Attr_First
-+ .. Curses_Constants.A_TOP_Last - Curses_Constants.Attr_First;
-+ Vertical at 0 range
-+ Curses_Constants.A_VERTICAL_First - Curses_Constants.Attr_First
-+ .. Curses_Constants.A_VERTICAL_Last - Curses_Constants.Attr_First;
-+ end record;
-
- Normal_Video : constant Character_Attribute_Set := (others => False);
-
-@@ -128,17 +492,29 @@
- Color : Color_Pair;
- Ch : Character;
- end record;
-- pragma Convention (C, Attributed_Character);
-+ pragma Convention (C_Pass_By_Copy, Attributed_Character);
- -- This is the counterpart for the chtype in C.
-
--include(`AC_Rep')
-+ for Attributed_Character use
-+ record
-+ Ch at 0 range Curses_Constants.A_CHARTEXT_First
-+ .. Curses_Constants.A_CHARTEXT_Last;
-+ Color at 0 range Curses_Constants.A_COLOR_First
-+ .. Curses_Constants.A_COLOR_Last;
-+ pragma Warnings (Off);
-+ Attr at 0 range Curses_Constants.Attr_First
-+ .. Curses_Constants.Attr_Last;
-+ pragma Warnings (On);
-+ end record;
-+ for Attributed_Character'Size use Curses_Constants.chtype_Size;
-+
- Default_Character : constant Attributed_Character
- := (Ch => Character'First,
- Color => Color_Pair'First,
- Attr => (others => False)); -- preelaboratable Normal_Video
-
- type Attributed_String is array (Positive range <>) of Attributed_Character;
-- pragma Pack (Attributed_String);
-+ pragma Convention (C, Attributed_String);
- -- In this binding we allow strings of attributed characters.
-
- ------------------
-@@ -188,7 +564,78 @@
- function Number_Of_Color_Pairs return Natural;
- pragma Inline (Number_Of_Color_Pairs);
-
--include(`ACS_Map')dnl
-+ subtype ACS_Index is Character range
-+ Character'Val (0) .. Character'Val (127);
-+ function ACS_Map (Index : ACS_Index) return Attributed_Character;
-+ pragma Import (C, ACS_Map, "acs_map_as_function");
-+
-+ -- Constants for several characters from the Alternate Character Set
-+ -- You must use these constants as indices into the ACS_Map function
-+ -- to get the corresponding attributed character at runtime
-+ ACS_Upper_Left_Corner : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_ULCORNER);
-+ ACS_Lower_Left_Corner : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_LLCORNER);
-+ ACS_Upper_Right_Corner : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_URCORNER);
-+ ACS_Lower_Right_Corner : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_LRCORNER);
-+ ACS_Left_Tee : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_LTEE);
-+ ACS_Right_Tee : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_RTEE);
-+ ACS_Bottom_Tee : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_BTEE);
-+ ACS_Top_Tee : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_TTEE);
-+ ACS_Horizontal_Line : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_HLINE);
-+ ACS_Vertical_Line : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_VLINE);
-+ ACS_Plus_Symbol : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_PLUS);
-+ ACS_Scan_Line_1 : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_S1);
-+ ACS_Scan_Line_9 : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_S9);
-+ ACS_Diamond : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_DIAMOND);
-+ ACS_Checker_Board : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_CKBOARD);
-+ ACS_Degree : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_DEGREE);
-+ ACS_Plus_Minus : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_PLMINUS);
-+ ACS_Bullet : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_BULLET);
-+ ACS_Left_Arrow : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_LARROW);
-+ ACS_Right_Arrow : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_RARROW);
-+ ACS_Down_Arrow : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_DARROW);
-+ ACS_Up_Arrow : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_UARROW);
-+ ACS_Board_Of_Squares : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_BOARD);
-+ ACS_Lantern : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_LANTERN);
-+ ACS_Solid_Block : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_BLOCK);
-+ ACS_Scan_Line_3 : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_S3);
-+ ACS_Scan_Line_7 : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_S7);
-+ ACS_Less_Or_Equal : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_LEQUAL);
-+ ACS_Greater_Or_Equal : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_GEQUAL);
-+ ACS_PI : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_PI);
-+ ACS_Not_Equal : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_NEQUAL);
-+ ACS_Sterling : constant ACS_Index
-+ := Character'Val (Curses_Constants.ACS_STERLING);
-
- -- MANPAGE(`curs_initscr.3x')
- -- | Not implemented: newterm, set_term, delscreen
-@@ -196,11 +643,13 @@
- -- ANCHOR(`stdscr',`Standard_Window')
- function Standard_Window return Window;
- -- AKA
-+ pragma Import (C, Standard_Window, "stdscr_as_function");
- pragma Inline (Standard_Window);
-
- -- ANCHOR(`curscr',`Current_Window')
- function Current_Window return Window;
- -- AKA
-+ pragma Import (C, Current_Window, "curscr_as_function");
- pragma Inline (Current_Window);
-
- -- ANCHOR(`initscr()',`Init_Screen')
-@@ -1476,6 +1925,8 @@
-
- -- MANPAGE(`default_colors.3x')
-
-+ Default_Color : constant Color_Number := -1;
-+
- -- ANCHOR(`use_default_colors()',`Use_Default_Colors')
- procedure Use_Default_Colors;
- -- AKA
-@@ -1553,7 +2004,11 @@
- -- The next constants are generated and may be different on your
- -- architecture.
- --
--include(`Window_Offsets')dnl
-+
-+ Sizeof_Bool : constant := Curses_Constants.Sizeof_Bool;
-+
-+ type Curses_Bool is mod 2 ** Sizeof_Bool;
-+
- Curses_Bool_False : constant Curses_Bool := 0;
-
- end Terminal_Interface.Curses;
-Index: Ada95/include/ncurses_defs
-Prereq: 1.41
---- ncurses-5.9/Ada95/include/ncurses_defs 2008-11-16 00:19:59.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/include/ncurses_defs 2013-04-27 19:50:17.000000000 +0000
-@@ -1,6 +1,6 @@
--# $Id: ncurses_defs,v 1.41 2008/11/16 00:19:59 juergen Exp $
-+# $Id: ncurses_defs,v 1.44 2013/04/27 19:50:17 tom Exp $
- ##############################################################################
--# Copyright (c) 2000-2007,2008 Free Software Foundation, Inc. #
-+# Copyright (c) 2000-2012,2013 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"), #
-@@ -33,7 +33,6 @@
-
- BROKEN_LINKER
- BSD_TPUTS
--CC_HAS_PROTOS
- CPP_HAS_PARAM_INIT
- CURSES_ACS_ARRAY acs_map
- CURSES_WACS_ARRAY _nc_wacs
-@@ -120,7 +119,6 @@
- HAVE_SIZECHANGE
- HAVE_SLK_COLOR
- HAVE_SLK_INIT 1
--HAVE_STRDUP
- HAVE_STRSTR
- HAVE_SYMLINK
- HAVE_SYS_BSDTYPES_H
-@@ -174,7 +172,6 @@
- NEED_PTEM_H
- NO_LEAKS
- PURE_TERMINFO
--RETSIGTYPE
- STDC_HEADERS
- SVR4_ACTION
- SVR4_TERMIO
-Index: Ada95/make-tar.sh
-Prereq: 1.12
---- ncurses-5.9/Ada95/make-tar.sh 2011-03-26 19:07:38.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/make-tar.sh 2013-10-26 23:10:24.000000000 +0000
-@@ -1,7 +1,7 @@
- #!/bin/sh
--# $Id: make-tar.sh,v 1.12 2011/03/26 19:07:38 tom Exp $
-+# $Id: make-tar.sh,v 1.14 2013/10/26 23:10:24 tom Exp $
- ##############################################################################
--# Copyright (c) 2010,2011 Free Software Foundation, Inc. #
-+# Copyright (c) 2010-2011,2013 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"), #
-@@ -66,11 +66,11 @@
- make_changelog() {
- test -f $1 && chmod u+w $1
- cat >$1 < 2000
- -- Version Control
---- $Revision: 1.6 $
---- $Date: 2011/03/23 00:44:12 $
-+-- $Revision: 1.7 $
-+-- $Date: 2014/09/13 19:10:18 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with ncurses2.util; use ncurses2.util;
-@@ -317,8 +317,9 @@
- function my_form_driver (f : Form; c : Key_Code) return Boolean is
- flag : constant Driver_Result := Driver (f, F_Validate_Field);
- begin
-- if c = Form_Request_Code'Last + 1
-- and flag = Form_Ok then
-+ if c = Form_Request_Code'Last + 1 and
-+ flag = Form_Ok
-+ then
- return True;
- else
- Beep;
-Index: Ada95/samples/ncurses2-demo_pad.adb
---- ncurses-5.9/Ada95/samples/ncurses2-demo_pad.adb 2011-03-23 00:44:12.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/samples/ncurses2-demo_pad.adb 2014-09-13 19:10:18.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 2000-2008,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 2000-2011,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Eugene V. Melaragno 2000
- -- Version Control
---- $Revision: 1.8 $
---- $Date: 2011/03/23 00:44:12 $
-+-- $Revision: 1.9 $
-+-- $Date: 2014/09/13 19:10:18 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with ncurses2.util; use ncurses2.util;
-@@ -437,7 +437,8 @@
- -- pan rightwards
- -- if (basex + portx - (pymax > porty) < pxmax)
- if basex + portx -
-- Column_Position (greater (pymax, porty)) < pxmax then
-+ Column_Position (greater (pymax, porty)) < pxmax
-+ then
- -- if basex + portx < pxmax or
- -- (pymax > porty and basex + portx - 1 < pxmax) then
- basex := basex + 1;
-@@ -457,7 +458,8 @@
- -- pan downwards
- -- same as if (basey + porty - (pxmax > portx) < pymax)
- if basey + porty -
-- Line_Position (greater (pxmax, portx)) < pymax then
-+ Line_Position (greater (pxmax, portx)) < pymax
-+ then
- -- if (basey + porty < pymax) or
- -- (pxmax > portx and basey + porty - 1 < pymax) then
- basey := basey + 1;
-Index: Ada95/samples/ncurses2-getch_test.adb
---- ncurses-5.9/Ada95/samples/ncurses2-getch_test.adb 2009-12-26 17:38:58.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/samples/ncurses2-getch_test.adb 2014-09-13 19:10:18.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 2000-2008,2009 Free Software Foundation, Inc. --
-+-- Copyright (c) 2000-2009,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Eugene V. Melaragno 2000
- -- Version Control
---- $Revision: 1.8 $
---- $Date: 2009/12/26 17:38:58 $
-+-- $Revision: 1.9 $
-+-- $Date: 2014/09/13 19:10:18 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- -- Character input test
-@@ -210,8 +210,10 @@
- end;
- elsif c = Character'Pos ('s') then
- ShellOut (True);
-- elsif c = Character'Pos ('x') or c = Character'Pos ('q') or
-- (c = Key_None and blockflag = Blocking) then
-+ elsif c = Character'Pos ('x') or
-+ c = Character'Pos ('q') or
-+ (c = Key_None and blockflag = Blocking)
-+ then
- exit;
- elsif c = Character'Pos ('?') then
- Add (Str => "Type any key to see its keypad value. Also:");
-Index: Ada95/samples/ncurses2-overlap_test.adb
---- ncurses-5.9/Ada95/samples/ncurses2-overlap_test.adb 2011-03-19 12:07:18.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/samples/ncurses2-overlap_test.adb 2014-09-13 19:10:18.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 2000-2004,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 2000-2011,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Eugene V. Melaragno 2000
- -- Version Control
---- $Revision: 1.5 $
---- $Date: 2011/03/19 12:07:18 $
-+-- $Revision: 1.6 $
-+-- $Date: 2014/09/13 19:10:18 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with ncurses2.util; use ncurses2.util;
-@@ -72,8 +72,9 @@
- Get_Size (win, y1, x1);
- for y in 0 .. y1 - 1 loop
- for x in 0 .. x1 - 1 loop
-- if ((x > (x1 - 1) / 3) and (x <= (2 * (x1 - 1)) / 3))
-- or (((y > (y1 - 1) / 3) and (y <= (2 * (y1 - 1)) / 3))) then
-+ if ((x > (x1 - 1) / 3) and (x <= (2 * (x1 - 1)) / 3)) or
-+ (((y > (y1 - 1) / 3) and (y <= (2 * (y1 - 1)) / 3)))
-+ then
- Move_Cursor (win, y, x);
- Add (win, Ch => ch);
- end if;
-Index: Ada95/samples/ncurses2-trace_set.adb
---- ncurses-5.9/Ada95/samples/ncurses2-trace_set.adb 2011-03-23 00:40:33.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/samples/ncurses2-trace_set.adb 2014-09-13 19:10:18.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 2000-2008,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 2000-2011,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Eugene V. Melaragno 2000
- -- Version Control
---- $Revision: 1.5 $
---- $Date: 2011/03/23 00:40:33 $
-+-- $Revision: 1.6 $
-+-- $Date: 2014/09/13 19:10:18 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with ncurses2.util; use ncurses2.util;
-@@ -141,7 +141,8 @@
- (super.Internal_Calls or not sub.Internal_Calls) and
- (super.Character_Calls or not sub.Character_Calls) and
- (super.Termcap_TermInfo or not sub.Termcap_TermInfo) and
-- True then
-+ True
-+ then
- return True;
- else
- return False;
-@@ -250,93 +251,107 @@
- else
-
- if subset (tlevel,
-- Trace_Attribute_Set'(Times => True, others => False)) then
-+ Trace_Attribute_Set'(Times => True, others => False))
-+ then
- Append (buf, "Times");
- Append (buf, ", ");
- end if;
-
- if subset (tlevel,
-- Trace_Attribute_Set'(Tputs => True, others => False)) then
-+ Trace_Attribute_Set'(Tputs => True, others => False))
-+ then
- Append (buf, "Tputs");
- Append (buf, ", ");
- end if;
-
- if subset (tlevel,
-- Trace_Attribute_Set'(Update => True, others => False)) then
-+ Trace_Attribute_Set'(Update => True, others => False))
-+ then
- Append (buf, "Update");
- Append (buf, ", ");
- end if;
-
- if subset (tlevel,
- Trace_Attribute_Set'(Cursor_Move => True,
-- others => False)) then
-+ others => False))
-+ then
- Append (buf, "Cursor_Move");
- Append (buf, ", ");
- end if;
-
- if subset (tlevel,
- Trace_Attribute_Set'(Character_Output => True,
-- others => False)) then
-+ others => False))
-+ then
- Append (buf, "Character_Output");
- Append (buf, ", ");
- end if;
-
- if subset (tlevel,
-- Trace_Ordinary) then
-+ Trace_Ordinary)
-+ then
- Append (buf, "Ordinary");
- Append (buf, ", ");
- end if;
-
- if subset (tlevel,
-- Trace_Attribute_Set'(Calls => True, others => False)) then
-+ Trace_Attribute_Set'(Calls => True, others => False))
-+ then
- Append (buf, "Calls");
- Append (buf, ", ");
- end if;
-
- if subset (tlevel,
- Trace_Attribute_Set'(Virtual_Puts => True,
-- others => False)) then
-+ others => False))
-+ then
- Append (buf, "Virtual_Puts");
- Append (buf, ", ");
- end if;
-
- if subset (tlevel,
- Trace_Attribute_Set'(Input_Events => True,
-- others => False)) then
-+ others => False))
-+ then
- Append (buf, "Input_Events");
- Append (buf, ", ");
- end if;
-
- if subset (tlevel,
- Trace_Attribute_Set'(TTY_State => True,
-- others => False)) then
-+ others => False))
-+ then
- Append (buf, "TTY_State");
- Append (buf, ", ");
- end if;
-
- if subset (tlevel,
- Trace_Attribute_Set'(Internal_Calls => True,
-- others => False)) then
-+ others => False))
-+ then
- Append (buf, "Internal_Calls");
- Append (buf, ", ");
- end if;
-
- if subset (tlevel,
- Trace_Attribute_Set'(Character_Calls => True,
-- others => False)) then
-+ others => False))
-+ then
- Append (buf, "Character_Calls");
- Append (buf, ", ");
- end if;
-
- if subset (tlevel,
- Trace_Attribute_Set'(Termcap_TermInfo => True,
-- others => False)) then
-+ others => False))
-+ then
- Append (buf, "Termcap_TermInfo");
- Append (buf, ", ");
- end if;
-
- if subset (tlevel,
-- Trace_Maximum) then
-+ Trace_Maximum)
-+ then
- Append (buf, "Maximium");
- Append (buf, ", ");
- end if;
-Index: Ada95/samples/ncurses2-util.adb
---- ncurses-5.9/Ada95/samples/ncurses2-util.adb 2008-07-26 18:51:20.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/samples/ncurses2-util.adb 2014-05-24 21:32:18.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 2000-2006,2008 Free Software Foundation, Inc. --
-+-- Copyright (c) 2000-2008,2014 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 --
-@@ -35,16 +35,12 @@
- ------------------------------------------------------------------------------
- -- Author: Eugene V. Melaragno 2000
- -- Version Control
---- $Revision: 1.7 $
---- $Date: 2008/07/26 18:51:20 $
-+-- $Revision: 1.9 $
-+-- $Date: 2014/05/24 21:32:18 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Ada.Text_IO; use Ada.Text_IO;
-
--pragma Warnings (Off);
--with Terminal_Interface.Curses.Aux;
--pragma Warnings (On);
--
- with Terminal_Interface.Curses.Trace; use Terminal_Interface.Curses.Trace;
-
- with Interfaces.C;
-@@ -115,7 +111,6 @@
- procedure Cannot (s : String) is
- use Interfaces.C;
- use Interfaces.C.Strings;
-- use Terminal_Interface.Curses.Aux;
- function getenv (x : char_array) return chars_ptr;
- pragma Import (C, getenv, "getenv");
- tmp1 : char_array (0 .. 10);
-Index: Ada95/samples/sample-explanation.adb
---- ncurses-5.9/Ada95/samples/sample-explanation.adb 2011-03-26 22:33:29.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/samples/sample-explanation.adb 2014-09-13 19:10:18.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control
---- $Revision: 1.26 $
---- $Date: 2011/03/26 22:33:29 $
-+-- $Revision: 1.27 $
-+-- $Date: 2014/09/13 19:10:18 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- -- Poor mans help system. This scans a sequential file for key lines and
-@@ -321,8 +321,10 @@
- Outer :
- loop
- exit Outer when not Next_Line;
-- if Last = (1 + Key'Length) and then Key = Buffer (2 .. Last)
-- and then Buffer (1) = '#' then
-+ if Last = (1 + Key'Length)
-+ and then Key = Buffer (2 .. Last)
-+ and then Buffer (1) = '#'
-+ then
- loop
- exit when not Next_Line;
- exit when Buffer (1) = '#';
-Index: Ada95/samples/sample-header_handler.adb
---- ncurses-5.9/Ada95/samples/sample-header_handler.adb 2011-03-22 23:54:38.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/samples/sample-header_handler.adb 2014-09-13 19:10:18.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control
---- $Revision: 1.19 $
---- $Date: 2011/03/22 23:54:38 $
-+-- $Revision: 1.20 $
-+-- $Date: 2014/09/13 19:10:18 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Ada.Calendar; use Ada.Calendar;
-@@ -121,8 +121,11 @@
- D : constant Day_Number := Day (Now);
- begin
- if Header_Window /= Null_Window then
-- if Minute /= Display_Min or else Hour /= Display_Hour
-- or else Display_Day /= D or else Display_Month /= Mon then
-+ if Minute /= Display_Min
-+ or else Hour /= Display_Hour
-+ or else Display_Day /= D
-+ or else Display_Month /= Mon
-+ then
- Move_Cursor (Header_Window, 0, 0);
- N_Out (D); Add (Header_Window, '.');
- Add (Header_Window, Month_Names (Mon));
-Index: Ada95/src/Makefile.in
-Prereq: 1.60
---- ncurses-5.9/Ada95/src/Makefile.in 2011-03-31 09:46:16.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/Makefile.in 2014-08-02 20:31:47.000000000 +0000
-@@ -1,5 +1,5 @@
- ##############################################################################
--# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. #
-+# Copyright (c) 1998-2011,2014 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.60 2011/03/31 09:46:16 tom Exp $
-+# $Id: Makefile.in,v 1.70 2014/08/02 20:31:47 tom Exp $
- #
- .SUFFIXES:
-
-@@ -215,25 +215,42 @@
-
- $(ABASE)-trace.adb : $(srcdir)/$(ABASE)-trace.adb_p
- rm -f $@
-- $(ADAPREP) -DADA_TRACE=@ADA_TRACE@ -DPRAGMA_UNREF=@PRAGMA_UNREF@ $(srcdir)/$(ABASE)-trace.adb_p $@
-+ $(ADAPREP) -DADA_TRACE=@ADA_TRACE@ @GNATPREP_OPTS@ $(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 c_threaded_variables.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
-
-+c_threaded_variables.o : $(srcdir)/c_threaded_variables.c
-+ $(CC) $(CFLAGS_DEFAULT) -c -o $@ $(srcdir)/c_threaded_variables.c
-+
- ncurses_compat.o : $(srcdir)/ncurses_compat.c
- $(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_c_threaded_variables.o static_ncurses_compat.o
-+STATIC_OBJS = $(STATIC_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_c_threaded_variables.o : $(srcdir)/c_threaded_variables.c
-+ $(CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/c_threaded_variables.c
-
--MIXED_OBJS = $(C_OBJS) @USE_OLD_MAKERULES@$(LIBOBJS) @cf_generic_objects@
-+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 +262,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 +291,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 \
-Index: Ada95/src/c_threaded_variables.c
---- /dev/null 2014-12-07 11:09:34.027922031 +0000
-+++ ncurses-5.9-20141206/Ada95/src/c_threaded_variables.c 2014-05-24 21:35:22.000000000 +0000
-@@ -0,0 +1,56 @@
-+/****************************************************************************
-+ * Copyright (c) 2011,2014 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"), to deal in the Software without restriction, including *
-+ * without limitation the rights to use, copy, modify, merge, publish, *
-+ * distribute, distribute with modifications, sublicense, and/or sell *
-+ * copies of the Software, and to permit persons to whom the Software is *
-+ * furnished to do so, subject to the following conditions: *
-+ * *
-+ * The above copyright notice and this permission notice shall be included *
-+ * in all copies or substantial portions of the Software. *
-+ * *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
-+ * *
-+ * Except as contained in this notice, the name(s) of the above copyright *
-+ * holders shall not be used in advertising or otherwise to promote the *
-+ * sale, use or other dealings in this Software without prior written *
-+ * authorization. *
-+ ****************************************************************************/
-+
-+/****************************************************************************
-+ * Author: Nicolas Boulenguez, 2011 *
-+ ****************************************************************************/
-+
-+#include "c_threaded_variables.h"
-+
-+#define WRAP(type, name) \
-+ type \
-+ name ## _as_function () \
-+ { \
-+ return name; \
-+ }
-+/* *INDENT-OFF* */
-+WRAP(WINDOW *, stdscr)
-+WRAP(WINDOW *, curscr)
-+
-+WRAP(int, LINES)
-+WRAP(int, COLS)
-+WRAP(int, TABSIZE)
-+WRAP(int, COLORS)
-+WRAP(int, COLOR_PAIRS)
-+
-+chtype
-+acs_map_as_function(char inx)
-+{
-+ return acs_map[(unsigned char) inx];
-+}
-+/* *INDENT-ON* */
-Index: Ada95/src/c_threaded_variables.h
---- /dev/null 2014-12-07 11:09:34.027922031 +0000
-+++ ncurses-5.9-20141206/Ada95/src/c_threaded_variables.h 2014-05-24 21:31:57.000000000 +0000
-@@ -0,0 +1,46 @@
-+/****************************************************************************
-+ * Copyright (c) 2011,2014 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"), to deal in the Software without restriction, including *
-+ * without limitation the rights to use, copy, modify, merge, publish, *
-+ * distribute, distribute with modifications, sublicense, and/or sell *
-+ * copies of the Software, and to permit persons to whom the Software is *
-+ * furnished to do so, subject to the following conditions: *
-+ * *
-+ * The above copyright notice and this permission notice shall be included *
-+ * in all copies or substantial portions of the Software. *
-+ * *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
-+ * *
-+ * Except as contained in this notice, the name(s) of the above copyright *
-+ * holders shall not be used in advertising or otherwise to promote the *
-+ * sale, use or other dealings in this Software without prior written *
-+ * authorization. *
-+ ****************************************************************************/
-+
-+#ifndef __C_THREADED_VARIABLES_H
-+#define __C_THREADED_VARIABLES_H
-+
-+#include
-+
-+extern WINDOW *stdscr_as_function(void);
-+extern WINDOW *curscr_as_function(void);
-+
-+extern int LINES_as_function(void);
-+extern int LINES_as_function(void);
-+extern int COLS_as_function(void);
-+extern int TABSIZE_as_function(void);
-+extern int COLORS_as_function(void);
-+extern int COLOR_PAIRS_as_function(void);
-+
-+extern chtype acs_map_as_function(char /* index */ );
-+
-+#endif /* __C_THREADED_VARIABLES_H */
-Index: Ada95/src/c_varargs_to_ada.c
-Prereq: 1.4
---- ncurses-5.9/Ada95/src/c_varargs_to_ada.c 2011-03-19 19:07:39.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/c_varargs_to_ada.c 2014-05-24 21:32:18.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2011 Free Software Foundation, Inc. *
-+ * Copyright (c) 2011,2014 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 *
-@@ -32,12 +32,12 @@
-
- /*
- Version Control
-- $Id: c_varargs_to_ada.c,v 1.4 2011/03/19 19:07:39 tom Exp $
-+ $Id: c_varargs_to_ada.c,v 1.6 2014/05/24 21:32:18 tom Exp $
- --------------------------------------------------------------------------*/
- /*
- */
-
--#include
-+#include "c_varargs_to_ada.h"
-
- int
- set_field_type_alnum(FIELD *field,
-Index: Ada95/src/library.gpr
-Prereq: 1.7
---- ncurses-5.9/Ada95/src/library.gpr 2011-03-18 23:10:28.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/library.gpr 2014-06-01 01:13:09.000000000 +0000
-@@ -1,5 +1,5 @@
- ------------------------------------------------------------------------------
---- Copyright (c) 2010,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 2010-2011,2014 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: library.gpr,v 1.7 2011/03/18 23:10:28 Nicolas.Boulenguez Exp $
-+-- $Id: library.gpr,v 1.9 2014/06/01 01:13:09 tom Exp $
- -- http://gcc.gnu.org/onlinedocs/gnat_ugn_unw/Library-Projects.html
- -- http://www.adaworld.com/debian/debian-ada-policy.html
- project Library is
-Index: Ada95/src/terminal_interface-curses-forms-field_types-alpha.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-forms-field_types-alpha.adb 2011-03-19 00:45:37.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-forms-field_types-alpha.adb 2014-05-24 21:31:05.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.11 $
---- $Date: 2011/03/19 00:45:37 $
-+-- $Revision: 1.13 $
-+-- $Date: 2014/05/24 21:31:05 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
-@@ -47,15 +47,11 @@
- Typ : Alpha_Field)
- is
- function Set_Fld_Type (F : Field := Fld;
-- Arg1 : C_Int) return C_Int;
-+ Arg1 : C_Int) return Eti_Error;
- pragma Import (C, Set_Fld_Type, "set_field_type_alpha");
-
-- Res : Eti_Error;
- begin
-- Res := Set_Fld_Type (Arg1 => C_Int (Typ.Minimum_Field_Width));
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Fld_Type (Arg1 => C_Int (Typ.Minimum_Field_Width)));
- Wrap_Builtin (Fld, Typ);
- end Set_Field_Type;
-
-Index: Ada95/src/terminal_interface-curses-forms-field_types-alphanumeric.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-forms-field_types-alphanumeric.adb 2011-03-19 00:45:37.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-forms-field_types-alphanumeric.adb 2014-05-24 21:31:05.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.11 $
---- $Date: 2011/03/19 00:45:37 $
-+-- $Revision: 1.13 $
-+-- $Date: 2014/05/24 21:31:05 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
-@@ -47,15 +47,11 @@
- Typ : AlphaNumeric_Field)
- is
- function Set_Fld_Type (F : Field := Fld;
-- Arg1 : C_Int) return C_Int;
-+ Arg1 : C_Int) return Eti_Error;
- pragma Import (C, Set_Fld_Type, "set_field_type_alnum");
-
-- Res : Eti_Error;
- begin
-- Res := Set_Fld_Type (Arg1 => C_Int (Typ.Minimum_Field_Width));
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Fld_Type (Arg1 => C_Int (Typ.Minimum_Field_Width)));
- Wrap_Builtin (Fld, Typ);
- end Set_Field_Type;
-
-Index: Ada95/src/terminal_interface-curses-forms-field_types-enumeration.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-forms-field_types-enumeration.adb 2011-03-22 23:03:27.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-forms-field_types-enumeration.adb 2014-05-24 21:31:05.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -35,7 +35,7 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.10 $
-+-- $Revision: 1.12 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Ada.Unchecked_Deallocation;
-@@ -94,21 +94,18 @@
- function Set_Fld_Type (F : Field := Fld;
- Arg1 : chars_ptr_array;
- Arg2 : C_Int;
-- Arg3 : C_Int) return C_Int;
-+ Arg3 : C_Int) return Eti_Error;
- pragma Import (C, Set_Fld_Type, "set_field_type_enum");
-
-- Res : Eti_Error;
- begin
- if Typ.Arr = null then
- raise Form_Exception;
- end if;
-- Res := Set_Fld_Type (Arg1 => Typ.Arr.all,
-- Arg2 => C_Int (Boolean'Pos (Typ.Case_Sensitive)),
-- Arg3 => C_Int (Boolean'Pos
-- (Typ.Match_Must_Be_Unique)));
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception
-+ (Set_Fld_Type
-+ (Arg1 => Typ.Arr.all,
-+ Arg2 => C_Int (Boolean'Pos (Typ.Case_Sensitive)),
-+ Arg3 => C_Int (Boolean'Pos (Typ.Match_Must_Be_Unique))));
- Wrap_Builtin (Fld, Typ, C_Choice_Router);
- end Set_Field_Type;
-
-Index: Ada95/src/terminal_interface-curses-forms-field_types-intfield.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-forms-field_types-intfield.adb 2011-03-19 00:45:37.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-forms-field_types-intfield.adb 2014-05-24 21:31:05.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.11 $
---- $Date: 2011/03/19 00:45:37 $
-+-- $Revision: 1.13 $
-+-- $Date: 2014/05/24 21:31:05 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
-@@ -49,17 +49,13 @@
- function Set_Fld_Type (F : Field := Fld;
- Arg1 : C_Int;
- Arg2 : C_Long_Int;
-- Arg3 : C_Long_Int) return C_Int;
-+ Arg3 : C_Long_Int) return Eti_Error;
- pragma Import (C, Set_Fld_Type, "set_field_type_integer");
-
-- Res : Eti_Error;
- begin
-- Res := Set_Fld_Type (Arg1 => C_Int (Typ.Precision),
-- Arg2 => C_Long_Int (Typ.Lower_Limit),
-- Arg3 => C_Long_Int (Typ.Upper_Limit));
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Fld_Type (Arg1 => C_Int (Typ.Precision),
-+ Arg2 => C_Long_Int (Typ.Lower_Limit),
-+ Arg3 => C_Long_Int (Typ.Upper_Limit)));
- Wrap_Builtin (Fld, Typ);
- end Set_Field_Type;
-
-Index: Ada95/src/terminal_interface-curses-forms-field_types-ipv4_address.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-forms-field_types-ipv4_address.adb 2011-03-19 00:45:37.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-forms-field_types-ipv4_address.adb 2014-05-24 21:31:05.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.11 $
---- $Date: 2011/03/19 00:45:37 $
-+-- $Revision: 1.13 $
-+-- $Date: 2014/05/24 21:31:05 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
-@@ -47,15 +47,11 @@
- Typ : Internet_V4_Address_Field)
- is
- function Set_Fld_Type (F : Field := Fld)
-- return C_Int;
-+ return Eti_Error;
- pragma Import (C, Set_Fld_Type, "set_field_type_ipv4");
-
-- Res : Eti_Error;
- begin
-- Res := Set_Fld_Type;
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Fld_Type);
- Wrap_Builtin (Fld, Typ);
- end Set_Field_Type;
-
-Index: Ada95/src/terminal_interface-curses-forms-field_types-numeric.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-forms-field_types-numeric.adb 2011-03-19 00:45:37.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-forms-field_types-numeric.adb 2014-05-24 21:31:05.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.12 $
---- $Date: 2011/03/19 00:45:37 $
-+-- $Revision: 1.14 $
-+-- $Date: 2014/05/24 21:31:05 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Interfaces.C;
-@@ -52,17 +52,13 @@
- function Set_Fld_Type (F : Field := Fld;
- Arg1 : C_Int;
- Arg2 : Double;
-- Arg3 : Double) return C_Int;
-+ Arg3 : Double) return Eti_Error;
- pragma Import (C, Set_Fld_Type, "set_field_type_numeric");
-
-- Res : Eti_Error;
- begin
-- Res := Set_Fld_Type (Arg1 => C_Int (Typ.Precision),
-- Arg2 => Double (Typ.Lower_Limit),
-- Arg3 => Double (Typ.Upper_Limit));
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Fld_Type (Arg1 => C_Int (Typ.Precision),
-+ Arg2 => Double (Typ.Lower_Limit),
-+ Arg3 => Double (Typ.Upper_Limit)));
- Wrap_Builtin (Fld, Typ);
- end Set_Field_Type;
-
-Index: Ada95/src/terminal_interface-curses-forms-field_types-regexp.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-forms-field_types-regexp.adb 2011-03-19 00:45:37.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-forms-field_types-regexp.adb 2014-05-24 21:31:05.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -35,7 +35,7 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.10 $
-+-- $Revision: 1.12 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Interfaces.C; use Interfaces.C;
-@@ -46,21 +46,12 @@
- procedure Set_Field_Type (Fld : Field;
- Typ : Regular_Expression_Field)
- is
-- type Char_Ptr is access all Interfaces.C.char;
--
- function Set_Ftyp (F : Field := Fld;
-- Arg1 : Char_Ptr) return C_Int;
-+ Arg1 : char_array) return Eti_Error;
- pragma Import (C, Set_Ftyp, "set_field_type_regexp");
-
-- Txt : char_array (0 .. Typ.Regular_Expression.all'Length);
-- Len : size_t;
-- Res : Eti_Error;
- begin
-- To_C (Typ.Regular_Expression.all, Txt, Len);
-- Res := Set_Ftyp (Arg1 => Txt (Txt'First)'Access);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Ftyp (Arg1 => To_C (Typ.Regular_Expression.all)));
- Wrap_Builtin (Fld, Typ);
- end Set_Field_Type;
-
-Index: Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb 2011-03-22 10:53:37.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb 2014-05-24 21:31:05.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2008,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.17 $
---- $Date: 2011/03/22 10:53:37 $
-+-- $Revision: 1.20 $
-+-- $Date: 2014/05/24 21:31:05 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with System.Address_To_Access_Conversions;
-@@ -53,7 +53,7 @@
- Result : Boolean;
- Udf : constant User_Defined_Field_Type_With_Choice_Access :=
- User_Defined_Field_Type_With_Choice_Access
-- (Argument_Access (Argument_Conversions.To_Pointer (Usr)).Typ);
-+ (Argument_Access (Argument_Conversions.To_Pointer (Usr)).all.Typ);
- begin
- Result := Next (Fld, Udf.all);
- return Curses_Bool (Boolean'Pos (Result));
-@@ -65,7 +65,7 @@
- Result : Boolean;
- Udf : constant User_Defined_Field_Type_With_Choice_Access :=
- User_Defined_Field_Type_With_Choice_Access
-- (Argument_Access (Argument_Conversions.To_Pointer (Usr)).Typ);
-+ (Argument_Access (Argument_Conversions.To_Pointer (Usr)).all.Typ);
- begin
- Result := Previous (Fld, Udf.all);
- return Curses_Bool (Boolean'Pos (Result));
-@@ -88,16 +88,12 @@
- Make_Arg'Access,
- Copy_Arg'Access,
- Free_Arg'Access);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Res);
-
- Res := Set_Fieldtype_Choice (T,
- Generic_Next'Access,
- Generic_Prev'Access);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Res);
- end if;
- M_Generic_Choice := T;
- end if;
-Index: Ada95/src/terminal_interface-curses-forms-field_types-user.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-forms-field_types-user.adb 2011-03-23 00:44:58.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-forms-field_types-user.adb 2014-05-24 21:31:05.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.21 $
---- $Date: 2011/03/23 00:44:58 $
-+-- $Revision: 1.23 $
-+-- $Date: 2014/05/24 21:31:05 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with System.Address_To_Access_Conversions;
-@@ -53,11 +53,9 @@
- function Set_Fld_Type (F : Field := Fld;
- Cft : C_Field_Type := C_Generic_Type;
- Arg1 : Argument_Access)
-- return C_Int;
-+ return Eti_Error;
- pragma Import (C, Set_Fld_Type, "set_field_type_user");
-
-- Res : Eti_Error;
--
- function Allocate_Arg (T : User_Defined_Field_Type'Class)
- return Argument_Access
- is
-@@ -70,10 +68,7 @@
- end Allocate_Arg;
-
- begin
-- Res := Set_Fld_Type (Arg1 => Allocate_Arg (Typ));
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Fld_Type (Arg1 => Allocate_Arg (Typ)));
- end Set_Field_Type;
-
- package Argument_Conversions is
-@@ -120,9 +115,7 @@
- Make_Arg'Access,
- Copy_Arg'Access,
- Free_Arg'Access);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Res);
- end if;
- M_Generic_Type := T;
- end if;
-Index: Ada95/src/terminal_interface-curses-forms-field_types.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-forms-field_types.adb 2011-03-22 23:22:27.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-forms-field_types.adb 2014-09-13 19:00:47.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.25 $
---- $Date: 2011/03/22 23:22:27 $
-+-- $Revision: 1.28 $
-+-- $Date: 2014/09/13 19:00:47 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
-@@ -76,9 +76,10 @@
- return null;
- else
- if Low_Level = M_Builtin_Router or else
-- Low_Level = M_Generic_Type or else
-- Low_Level = M_Choice_Router or else
-- Low_Level = M_Generic_Choice then
-+ Low_Level = M_Generic_Type or else
-+ Low_Level = M_Choice_Router or else
-+ Low_Level = M_Generic_Choice
-+ then
- Arg := Argument_Access
- (Argument_Conversions.To_Pointer (Get_Arg (Fld)));
- if Arg = null then
-@@ -130,10 +131,9 @@
- Usr_Arg : constant System.Address := Get_Arg (Fld);
- Low_Level : constant C_Field_Type := Get_Fieldtype (Fld);
- Arg : Argument_Access;
-- Res : Eti_Error;
- function Set_Fld_Type (F : Field := Fld;
- Cf : C_Field_Type := Cft;
-- Arg1 : Argument_Access) return C_Int;
-+ Arg1 : Argument_Access) return Eti_Error;
- pragma Import (C, Set_Fld_Type, "set_field_type_user");
-
- begin
-@@ -152,10 +152,7 @@
- end if;
- end if;
-
-- Res := Set_Fld_Type (Arg1 => Arg);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Fld_Type (Arg1 => Arg));
- end if;
- end Wrap_Builtin;
-
-@@ -223,7 +220,6 @@
- --
- function C_Builtin_Router return C_Field_Type
- is
-- Res : Eti_Error;
- T : C_Field_Type;
- begin
- if M_Builtin_Router = Null_Field_Type then
-@@ -232,13 +228,10 @@
- if T = Null_Field_Type then
- raise Form_Exception;
- else
-- Res := Set_Fieldtype_Arg (T,
-- Make_Arg'Access,
-- Copy_Arg'Access,
-- Free_Arg'Access);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Fieldtype_Arg (T,
-+ Make_Arg'Access,
-+ Copy_Arg'Access,
-+ Free_Arg'Access));
- end if;
- M_Builtin_Router := T;
- end if;
-@@ -250,7 +243,6 @@
- --
- function C_Choice_Router return C_Field_Type
- is
-- Res : Eti_Error;
- T : C_Field_Type;
- begin
- if M_Choice_Router = Null_Field_Type then
-@@ -259,20 +251,14 @@
- if T = Null_Field_Type then
- raise Form_Exception;
- else
-- Res := Set_Fieldtype_Arg (T,
-- Make_Arg'Access,
-- Copy_Arg'Access,
-- Free_Arg'Access);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
--
-- Res := Set_Fieldtype_Choice (T,
-- Next_Router'Access,
-- Prev_Router'Access);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Fieldtype_Arg (T,
-+ Make_Arg'Access,
-+ Copy_Arg'Access,
-+ Free_Arg'Access));
-+
-+ Eti_Exception (Set_Fieldtype_Choice (T,
-+ Next_Router'Access,
-+ Prev_Router'Access));
- end if;
- M_Choice_Router := T;
- end if;
-Index: Ada95/src/terminal_interface-curses-forms-field_user_data.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-forms-field_user_data.adb 2009-12-26 17:46:57.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-forms-field_user_data.adb 2014-05-24 21:31:05.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2009,2014 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 --
-@@ -35,7 +35,7 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.13 $
-+-- $Revision: 1.15 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
-@@ -55,14 +55,11 @@
- Data : User_Access)
- is
- function Set_Field_Userptr (Fld : Field;
-- Usr : User_Access) return C_Int;
-+ Usr : User_Access) return Eti_Error;
- pragma Import (C, Set_Field_Userptr, "set_field_userptr");
-
-- Res : constant Eti_Error := Set_Field_Userptr (Fld, Data);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Field_Userptr (Fld, Data));
- end Set_User_Data;
- -- |
- -- |
-Index: Ada95/src/terminal_interface-curses-forms-form_user_data.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-forms-form_user_data.adb 2009-12-26 17:46:57.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-forms-form_user_data.adb 2014-05-24 21:31:05.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2009,2014 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 --
-@@ -35,7 +35,7 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.13 $
-+-- $Revision: 1.15 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- -- |
-@@ -56,14 +56,11 @@
- Data : User_Access)
- is
- function Set_Form_Userptr (Frm : Form;
-- Data : User_Access) return C_Int;
-+ Data : User_Access) return Eti_Error;
- pragma Import (C, Set_Form_Userptr, "set_form_userptr");
-
-- Res : constant Eti_Error := Set_Form_Userptr (Frm, Data);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Form_Userptr (Frm, Data));
- end Set_User_Data;
- -- |
- -- |
-Index: Ada95/src/terminal_interface-curses-forms.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-forms.adb 2011-03-22 23:37:32.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-forms.adb 2014-05-24 21:31:05.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -35,12 +35,11 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.28 $
---- $Date: 2011/03/22 23:37:32 $
-+-- $Revision: 1.32 $
-+-- $Date: 2014/05/24 21:31:05 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Ada.Unchecked_Deallocation;
--with Ada.Unchecked_Conversion;
-
- with Interfaces.C; use Interfaces.C;
- with Interfaces.C.Strings; use Interfaces.C.Strings;
-@@ -62,22 +61,6 @@
- -- |
- -- subtype chars_ptr is Interfaces.C.Strings.chars_ptr;
-
-- function FOS_2_CInt is new
-- Ada.Unchecked_Conversion (Field_Option_Set,
-- C_Int);
--
-- function CInt_2_FOS is new
-- Ada.Unchecked_Conversion (C_Int,
-- Field_Option_Set);
--
-- function FrmOS_2_CInt is new
-- Ada.Unchecked_Conversion (Form_Option_Set,
-- C_Int);
--
-- function CInt_2_FrmOS is new
-- Ada.Unchecked_Conversion (C_Int,
-- Form_Option_Set);
--
- procedure Request_Name (Key : Form_Request_Code;
- Name : out String)
- is
-@@ -130,15 +113,11 @@
- -- |
- procedure Delete (Fld : in out Field)
- is
-- function Free_Field (Fld : Field) return C_Int;
-+ function Free_Field (Fld : Field) return Eti_Error;
- pragma Import (C, Free_Field, "free_field");
-
-- Res : Eti_Error;
- begin
-- Res := Free_Field (Fld);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Free_Field (Fld));
- Fld := Null_Field;
- end Delete;
- -- |
-@@ -194,16 +173,12 @@
- Just : Field_Justification := None)
- is
- function Set_Field_Just (Fld : Field;
-- Just : C_Int) return C_Int;
-+ Just : C_Int) return Eti_Error;
- pragma Import (C, Set_Field_Just, "set_field_just");
-
-- Res : constant Eti_Error :=
-- Set_Field_Just (Fld,
-- C_Int (Field_Justification'Pos (Just)));
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Field_Just (Fld,
-+ C_Int (Field_Justification'Pos (Just))));
- end Set_Justification;
- -- |
- -- |
-@@ -227,22 +202,14 @@
- Buffer : Buffer_Number := Buffer_Number'First;
- Str : String)
- is
-- type Char_Ptr is access all Interfaces.C.char;
- function Set_Fld_Buffer (Fld : Field;
- Bufnum : C_Int;
-- S : Char_Ptr)
-- return C_Int;
-+ S : char_array)
-+ return Eti_Error;
- pragma Import (C, Set_Fld_Buffer, "set_field_buffer");
-
-- Txt : char_array (0 .. Str'Length);
-- Len : size_t;
-- Res : Eti_Error;
-- begin
-- To_C (Str, Txt, Len);
-- Res := Set_Fld_Buffer (Fld, C_Int (Buffer), Txt (Txt'First)'Access);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ begin
-+ Eti_Exception (Set_Fld_Buffer (Fld, C_Int (Buffer), To_C (Str)));
- end Set_Buffer;
- -- |
- -- |
-@@ -276,12 +243,11 @@
- Status : Boolean := True)
- is
- function Set_Fld_Status (Fld : Field;
-- St : C_Int) return C_Int;
-+ St : C_Int) return Eti_Error;
- pragma Import (C, Set_Fld_Status, "set_field_status");
-
-- Res : constant Eti_Error := Set_Fld_Status (Fld, Boolean'Pos (Status));
- begin
-- if Res /= E_Ok then
-+ if Set_Fld_Status (Fld, Boolean'Pos (Status)) /= E_Ok then
- raise Form_Exception;
- end if;
- end Set_Status;
-@@ -308,14 +274,11 @@
- Max : Natural := 0)
- is
- function Set_Field_Max (Fld : Field;
-- M : C_Int) return C_Int;
-+ M : C_Int) return Eti_Error;
- pragma Import (C, Set_Field_Max, "set_max_field");
-
-- Res : constant Eti_Error := Set_Field_Max (Fld, C_Int (Max));
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Field_Max (Fld, C_Int (Max)));
- end Set_Maximum_Size;
- -- |
- -- |=====================================================================
-@@ -328,16 +291,11 @@
- Options : Field_Option_Set)
- is
- function Set_Field_Opts (Fld : Field;
-- Opt : C_Int) return C_Int;
-+ Opt : Field_Option_Set) return Eti_Error;
- pragma Import (C, Set_Field_Opts, "set_field_opts");
-
-- Opt : constant C_Int := FOS_2_CInt (Options);
-- Res : Eti_Error;
- begin
-- Res := Set_Field_Opts (Fld, Opt);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Field_Opts (Fld, Options));
- end Set_Options;
- -- |
- -- |
-@@ -347,22 +305,17 @@
- On : Boolean := True)
- is
- function Field_Opts_On (Fld : Field;
-- Opt : C_Int) return C_Int;
-+ Opt : Field_Option_Set) return Eti_Error;
- pragma Import (C, Field_Opts_On, "field_opts_on");
- function Field_Opts_Off (Fld : Field;
-- Opt : C_Int) return C_Int;
-+ Opt : Field_Option_Set) return Eti_Error;
- pragma Import (C, Field_Opts_Off, "field_opts_off");
-
-- Err : Eti_Error;
-- Opt : constant C_Int := FOS_2_CInt (Options);
- begin
- if On then
-- Err := Field_Opts_On (Fld, Opt);
-+ Eti_Exception (Field_Opts_On (Fld, Options));
- else
-- Err := Field_Opts_Off (Fld, Opt);
-- end if;
-- if Err /= E_Ok then
-- Eti_Exception (Err);
-+ Eti_Exception (Field_Opts_Off (Fld, Options));
- end if;
- end Switch_Options;
- -- |
-@@ -371,12 +324,11 @@
- procedure Get_Options (Fld : Field;
- Options : out Field_Option_Set)
- is
-- function Field_Opts (Fld : Field) return C_Int;
-+ function Field_Opts (Fld : Field) return Field_Option_Set;
- pragma Import (C, Field_Opts, "field_opts");
-
-- Res : constant C_Int := Field_Opts (Fld);
- begin
-- Options := CInt_2_FOS (Res);
-+ Options := Field_Opts (Fld);
- end Get_Options;
- -- |
- -- |
-@@ -402,18 +354,13 @@
- Color : Color_Pair := Color_Pair'First)
- is
- function Set_Field_Fore (Fld : Field;
-- Attr : C_Chtype) return C_Int;
-+ Attr : Attributed_Character) return Eti_Error;
- pragma Import (C, Set_Field_Fore, "set_field_fore");
-
-- Ch : constant Attributed_Character := (Ch => Character'First,
-- Color => Color,
-- Attr => Fore);
-- Res : constant Eti_Error :=
-- Set_Field_Fore (Fld, AttrChar_To_Chtype (Ch));
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Field_Fore (Fld, (Ch => Character'First,
-+ Color => Color,
-+ Attr => Fore)));
- end Set_Foreground;
- -- |
- -- |
-@@ -421,21 +368,21 @@
- procedure Foreground (Fld : Field;
- Fore : out Character_Attribute_Set)
- is
-- function Field_Fore (Fld : Field) return C_Chtype;
-+ function Field_Fore (Fld : Field) return Attributed_Character;
- pragma Import (C, Field_Fore, "field_fore");
- begin
-- Fore := Chtype_To_AttrChar (Field_Fore (Fld)).Attr;
-+ Fore := Field_Fore (Fld).Attr;
- end Foreground;
-
- procedure Foreground (Fld : Field;
- Fore : out Character_Attribute_Set;
- Color : out Color_Pair)
- is
-- function Field_Fore (Fld : Field) return C_Chtype;
-+ function Field_Fore (Fld : Field) return Attributed_Character;
- pragma Import (C, Field_Fore, "field_fore");
- begin
-- Fore := Chtype_To_AttrChar (Field_Fore (Fld)).Attr;
-- Color := Chtype_To_AttrChar (Field_Fore (Fld)).Color;
-+ Fore := Field_Fore (Fld).Attr;
-+ Color := Field_Fore (Fld).Color;
- end Foreground;
- -- |
- -- |
-@@ -446,18 +393,13 @@
- Color : Color_Pair := Color_Pair'First)
- is
- function Set_Field_Back (Fld : Field;
-- Attr : C_Chtype) return C_Int;
-+ Attr : Attributed_Character) return Eti_Error;
- pragma Import (C, Set_Field_Back, "set_field_back");
-
-- Ch : constant Attributed_Character := (Ch => Character'First,
-- Color => Color,
-- Attr => Back);
-- Res : constant Eti_Error :=
-- Set_Field_Back (Fld, AttrChar_To_Chtype (Ch));
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Field_Back (Fld, (Ch => Character'First,
-+ Color => Color,
-+ Attr => Back)));
- end Set_Background;
- -- |
- -- |
-@@ -465,21 +407,21 @@
- procedure Background (Fld : Field;
- Back : out Character_Attribute_Set)
- is
-- function Field_Back (Fld : Field) return C_Chtype;
-+ function Field_Back (Fld : Field) return Attributed_Character;
- pragma Import (C, Field_Back, "field_back");
- begin
-- Back := Chtype_To_AttrChar (Field_Back (Fld)).Attr;
-+ Back := Field_Back (Fld).Attr;
- end Background;
-
- procedure Background (Fld : Field;
- Back : out Character_Attribute_Set;
- Color : out Color_Pair)
- is
-- function Field_Back (Fld : Field) return C_Chtype;
-+ function Field_Back (Fld : Field) return Attributed_Character;
- pragma Import (C, Field_Back, "field_back");
- begin
-- Back := Chtype_To_AttrChar (Field_Back (Fld)).Attr;
-- Color := Chtype_To_AttrChar (Field_Back (Fld)).Color;
-+ Back := Field_Back (Fld).Attr;
-+ Color := Field_Back (Fld).Color;
- end Background;
- -- |
- -- |
-@@ -488,15 +430,12 @@
- Pad : Character := Space)
- is
- function Set_Field_Pad (Fld : Field;
-- Ch : C_Int) return C_Int;
-+ Ch : C_Int) return Eti_Error;
- pragma Import (C, Set_Field_Pad, "set_field_pad");
-
-- Res : constant Eti_Error := Set_Field_Pad (Fld,
-- C_Int (Character'Pos (Pad)));
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Field_Pad (Fld,
-+ C_Int (Character'Pos (Pad))));
- end Set_Pad_Character;
- -- |
- -- |
-@@ -527,25 +466,21 @@
- type C_Int_Access is access all C_Int;
- function Fld_Info (Fld : Field;
- L, C, Fr, Fc, Os, Ab : C_Int_Access)
-- return C_Int;
-+ return Eti_Error;
- pragma Import (C, Fld_Info, "field_info");
-
- L, C, Fr, Fc, Os, Ab : aliased C_Int;
-- Res : constant Eti_Error := Fld_Info (Fld,
-- L'Access, C'Access,
-- Fr'Access, Fc'Access,
-- Os'Access, Ab'Access);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- else
-- Lines := Line_Count (L);
-- Columns := Column_Count (C);
-- First_Row := Line_Position (Fr);
-- First_Column := Column_Position (Fc);
-- Off_Screen := Natural (Os);
-- Additional_Buffers := Buffer_Number (Ab);
-- end if;
-+ Eti_Exception (Fld_Info (Fld,
-+ L'Access, C'Access,
-+ Fr'Access, Fc'Access,
-+ Os'Access, Ab'Access));
-+ Lines := Line_Count (L);
-+ Columns := Column_Count (C);
-+ First_Row := Line_Position (Fr);
-+ First_Column := Column_Position (Fc);
-+ Off_Screen := Natural (Os);
-+ Additional_Buffers := Buffer_Number (Ab);
- end Info;
- -- |
- -- |
-@@ -556,21 +491,17 @@
- Max : out Natural)
- is
- type C_Int_Access is access all C_Int;
-- function Dyn_Info (Fld : Field; L, C, M : C_Int_Access) return C_Int;
-+ function Dyn_Info (Fld : Field; L, C, M : C_Int_Access) return Eti_Error;
- pragma Import (C, Dyn_Info, "dynamic_field_info");
-
- L, C, M : aliased C_Int;
-- Res : constant Eti_Error := Dyn_Info (Fld,
-- L'Access, C'Access,
-- M'Access);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- else
-- Lines := Line_Count (L);
-- Columns := Column_Count (C);
-- Max := Natural (M);
-- end if;
-+ Eti_Exception (Dyn_Info (Fld,
-+ L'Access, C'Access,
-+ M'Access));
-+ Lines := Line_Count (L);
-+ Columns := Column_Count (C);
-+ Max := Natural (M);
- end Dynamic_Info;
- -- |
- -- |=====================================================================
-@@ -583,14 +514,11 @@
- Win : Window)
- is
- function Set_Form_Win (Frm : Form;
-- Win : Window) return C_Int;
-+ Win : Window) return Eti_Error;
- pragma Import (C, Set_Form_Win, "set_form_win");
-
-- Res : constant Eti_Error := Set_Form_Win (Frm, Win);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Form_Win (Frm, Win));
- end Set_Window;
- -- |
- -- |
-@@ -611,14 +539,11 @@
- Win : Window)
- is
- function Set_Form_Sub (Frm : Form;
-- Win : Window) return C_Int;
-+ Win : Window) return Eti_Error;
- pragma Import (C, Set_Form_Sub, "set_form_sub");
-
-- Res : constant Eti_Error := Set_Form_Sub (Frm, Win);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Form_Sub (Frm, Win));
- end Set_Sub_Window;
- -- |
- -- |
-@@ -640,16 +565,13 @@
- Columns : out Column_Count)
- is
- type C_Int_Access is access all C_Int;
-- function M_Scale (Frm : Form; Yp, Xp : C_Int_Access) return C_Int;
-+ function M_Scale (Frm : Form; Yp, Xp : C_Int_Access) return Eti_Error;
- pragma Import (C, M_Scale, "scale_form");
-
- X, Y : aliased C_Int;
-- Res : constant Eti_Error := M_Scale (Frm, Y'Access, X'Access);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-- Lines := Line_Count (Y);
-+ Eti_Exception (M_Scale (Frm, Y'Access, X'Access));
-+ Lines := Line_Count (Y);
- Columns := Column_Count (X);
- end Scale;
- -- |
-@@ -663,14 +585,11 @@
- Proc : Form_Hook_Function)
- is
- function Set_Field_Init (Frm : Form;
-- Proc : Form_Hook_Function) return C_Int;
-+ Proc : Form_Hook_Function) return Eti_Error;
- pragma Import (C, Set_Field_Init, "set_field_init");
-
-- Res : constant Eti_Error := Set_Field_Init (Frm, Proc);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Field_Init (Frm, Proc));
- end Set_Field_Init_Hook;
- -- |
- -- |
-@@ -679,14 +598,11 @@
- Proc : Form_Hook_Function)
- is
- function Set_Field_Term (Frm : Form;
-- Proc : Form_Hook_Function) return C_Int;
-+ Proc : Form_Hook_Function) return Eti_Error;
- pragma Import (C, Set_Field_Term, "set_field_term");
-
-- Res : constant Eti_Error := Set_Field_Term (Frm, Proc);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Field_Term (Frm, Proc));
- end Set_Field_Term_Hook;
- -- |
- -- |
-@@ -695,14 +611,11 @@
- Proc : Form_Hook_Function)
- is
- function Set_Form_Init (Frm : Form;
-- Proc : Form_Hook_Function) return C_Int;
-+ Proc : Form_Hook_Function) return Eti_Error;
- pragma Import (C, Set_Form_Init, "set_form_init");
-
-- Res : constant Eti_Error := Set_Form_Init (Frm, Proc);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Form_Init (Frm, Proc));
- end Set_Form_Init_Hook;
- -- |
- -- |
-@@ -711,14 +624,11 @@
- Proc : Form_Hook_Function)
- is
- function Set_Form_Term (Frm : Form;
-- Proc : Form_Hook_Function) return C_Int;
-+ Proc : Form_Hook_Function) return Eti_Error;
- pragma Import (C, Set_Form_Term, "set_form_term");
-
-- Res : constant Eti_Error := Set_Form_Term (Frm, Proc);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Form_Term (Frm, Proc));
- end Set_Form_Term_Hook;
- -- |
- -- |=====================================================================
-@@ -731,19 +641,15 @@
- Flds : Field_Array_Access)
- is
- function Set_Frm_Fields (Frm : Form;
-- Items : System.Address) return C_Int;
-+ Items : System.Address) return Eti_Error;
- pragma Import (C, Set_Frm_Fields, "set_form_fields");
-
-- Res : Eti_Error;
- begin
- pragma Assert (Flds.all (Flds'Last) = Null_Field);
- if Flds.all (Flds'Last) /= Null_Field then
- raise Form_Exception;
- else
-- Res := Set_Frm_Fields (Frm, Flds.all (Flds'First)'Address);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Frm_Fields (Frm, Flds.all (Flds'First)'Address));
- end if;
- end Redefine;
- -- |
-@@ -783,14 +689,11 @@
- Line : Line_Position;
- Column : Column_Position)
- is
-- function Move (Fld : Field; L, C : C_Int) return C_Int;
-+ function Move (Fld : Field; L, C : C_Int) return Eti_Error;
- pragma Import (C, Move, "move_field");
-
-- Res : constant Eti_Error := Move (Fld, C_Int (Line), C_Int (Column));
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Move (Fld, C_Int (Line), C_Int (Column)));
- end Move;
- -- |
- -- |=====================================================================
-@@ -822,14 +725,11 @@
- -- |
- procedure Delete (Frm : in out Form)
- is
-- function Free (Frm : Form) return C_Int;
-+ function Free (Frm : Form) return Eti_Error;
- pragma Import (C, Free, "free_form");
-
-- Res : constant Eti_Error := Free (Frm);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Free (Frm));
- Frm := Null_Form;
- end Delete;
- -- |
-@@ -843,16 +743,11 @@
- Options : Form_Option_Set)
- is
- function Set_Form_Opts (Frm : Form;
-- Opt : C_Int) return C_Int;
-+ Opt : Form_Option_Set) return Eti_Error;
- pragma Import (C, Set_Form_Opts, "set_form_opts");
-
-- Opt : constant C_Int := FrmOS_2_CInt (Options);
-- Res : Eti_Error;
- begin
-- Res := Set_Form_Opts (Frm, Opt);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Form_Opts (Frm, Options));
- end Set_Options;
- -- |
- -- |
-@@ -862,22 +757,17 @@
- On : Boolean := True)
- is
- function Form_Opts_On (Frm : Form;
-- Opt : C_Int) return C_Int;
-+ Opt : Form_Option_Set) return Eti_Error;
- pragma Import (C, Form_Opts_On, "form_opts_on");
- function Form_Opts_Off (Frm : Form;
-- Opt : C_Int) return C_Int;
-+ Opt : Form_Option_Set) return Eti_Error;
- pragma Import (C, Form_Opts_Off, "form_opts_off");
-
-- Err : Eti_Error;
-- Opt : constant C_Int := FrmOS_2_CInt (Options);
- begin
- if On then
-- Err := Form_Opts_On (Frm, Opt);
-+ Eti_Exception (Form_Opts_On (Frm, Options));
- else
-- Err := Form_Opts_Off (Frm, Opt);
-- end if;
-- if Err /= E_Ok then
-- Eti_Exception (Err);
-+ Eti_Exception (Form_Opts_Off (Frm, Options));
- end if;
- end Switch_Options;
- -- |
-@@ -886,12 +776,11 @@
- procedure Get_Options (Frm : Form;
- Options : out Form_Option_Set)
- is
-- function Form_Opts (Frm : Form) return C_Int;
-+ function Form_Opts (Frm : Form) return Form_Option_Set;
- pragma Import (C, Form_Opts, "form_opts");
-
-- Res : constant C_Int := Form_Opts (Frm);
- begin
-- Options := CInt_2_FrmOS (Res);
-+ Options := Form_Opts (Frm);
- end Get_Options;
- -- |
- -- |
-@@ -913,20 +802,16 @@
- procedure Post (Frm : Form;
- Post : Boolean := True)
- is
-- function M_Post (Frm : Form) return C_Int;
-+ function M_Post (Frm : Form) return Eti_Error;
- pragma Import (C, M_Post, "post_form");
-- function M_Unpost (Frm : Form) return C_Int;
-+ function M_Unpost (Frm : Form) return Eti_Error;
- pragma Import (C, M_Unpost, "unpost_form");
-
-- Res : Eti_Error;
- begin
- if Post then
-- Res := M_Post (Frm);
-+ Eti_Exception (M_Post (Frm));
- else
-- Res := M_Unpost (Frm);
-- end if;
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-+ Eti_Exception (M_Unpost (Frm));
- end if;
- end Post;
- -- |
-@@ -938,14 +823,11 @@
- -- |
- procedure Position_Cursor (Frm : Form)
- is
-- function Pos_Form_Cursor (Frm : Form) return C_Int;
-+ function Pos_Form_Cursor (Frm : Form) return Eti_Error;
- pragma Import (C, Pos_Form_Cursor, "pos_form_cursor");
-
-- Res : constant Eti_Error := Pos_Form_Cursor (Frm);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Pos_Form_Cursor (Frm));
- end Position_Cursor;
- -- |
- -- |=====================================================================
-@@ -993,25 +875,22 @@
- function Driver (Frm : Form;
- Key : Key_Code) return Driver_Result
- is
-- function Frm_Driver (Frm : Form; Key : C_Int) return C_Int;
-+ function Frm_Driver (Frm : Form; Key : C_Int) return Eti_Error;
- pragma Import (C, Frm_Driver, "form_driver");
-
- R : constant Eti_Error := Frm_Driver (Frm, C_Int (Key));
- begin
-- if R /= E_Ok then
-- if R = E_Unknown_Command then
-+ case R is
-+ when E_Unknown_Command =>
- return Unknown_Request;
-- elsif R = E_Invalid_Field then
-+ when E_Invalid_Field =>
- return Invalid_Field;
-- elsif R = E_Request_Denied then
-+ when E_Request_Denied =>
- return Request_Denied;
-- else
-+ when others =>
- Eti_Exception (R);
- return Form_Ok;
-- end if;
-- else
-- return Form_Ok;
-- end if;
-+ end case;
- end Driver;
- -- |
- -- |=====================================================================
-@@ -1023,14 +902,11 @@
- procedure Set_Current (Frm : Form;
- Fld : Field)
- is
-- function Set_Current_Fld (Frm : Form; Fld : Field) return C_Int;
-+ function Set_Current_Fld (Frm : Form; Fld : Field) return Eti_Error;
- pragma Import (C, Set_Current_Fld, "set_current_field");
-
-- Res : constant Eti_Error := Set_Current_Fld (Frm, Fld);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Current_Fld (Frm, Fld));
- end Set_Current;
- -- |
- -- |
-@@ -1053,14 +929,11 @@
- procedure Set_Page (Frm : Form;
- Page : Page_Number := Page_Number'First)
- is
-- function Set_Frm_Page (Frm : Form; Pg : C_Int) return C_Int;
-+ function Set_Frm_Page (Frm : Form; Pg : C_Int) return Eti_Error;
- pragma Import (C, Set_Frm_Page, "set_form_page");
-
-- Res : constant Eti_Error := Set_Frm_Page (Frm, C_Int (Page));
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Frm_Page (Frm, C_Int (Page)));
- end Set_Page;
- -- |
- -- |
-@@ -1102,14 +975,11 @@
- procedure Set_New_Page (Fld : Field;
- New_Page : Boolean := True)
- is
-- function Set_Page (Fld : Field; Flg : C_Int) return C_Int;
-+ function Set_Page (Fld : Field; Flg : C_Int) return Eti_Error;
- pragma Import (C, Set_Page, "set_new_page");
-
-- Res : constant Eti_Error := Set_Page (Fld, Boolean'Pos (New_Page));
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Page (Fld, Boolean'Pos (New_Page)));
- end Set_New_Page;
- -- |
- -- |
-Index: Ada95/src/terminal_interface-curses-menus-item_user_data.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-menus-item_user_data.adb 2009-12-26 17:46:57.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-menus-item_user_data.adb 2014-05-24 21:31:05.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2009,2014 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 --
-@@ -35,7 +35,7 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.12 $
-+-- $Revision: 1.14 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Interfaces.C;
-@@ -49,14 +49,11 @@
- Data : User_Access)
- is
- function Set_Item_Userptr (Itm : Item;
-- Addr : User_Access) return C_Int;
-+ Addr : User_Access) return Eti_Error;
- pragma Import (C, Set_Item_Userptr, "set_item_userptr");
-
-- Res : constant Eti_Error := Set_Item_Userptr (Itm, Data);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Item_Userptr (Itm, Data));
- end Set_User_Data;
-
- function Get_User_Data (Itm : Item) return User_Access
-Index: Ada95/src/terminal_interface-curses-menus-menu_user_data.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-menus-menu_user_data.adb 2009-12-26 17:46:57.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-menus-menu_user_data.adb 2014-05-24 21:31:05.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2009,2014 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 --
-@@ -35,7 +35,7 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.13 $
-+-- $Revision: 1.15 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
-@@ -48,14 +48,12 @@
- Data : User_Access)
- is
- function Set_Menu_Userptr (Men : Menu;
-- Data : User_Access) return C_Int;
-+ Data : User_Access) return Eti_Error;
- pragma Import (C, Set_Menu_Userptr, "set_menu_userptr");
-
-- Res : constant Eti_Error := Set_Menu_Userptr (Men, Data);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Menu_Userptr (Men, Data));
-+
- end Set_User_Data;
-
- function Get_User_Data (Men : Menu) return User_Access
-Index: Ada95/src/terminal_interface-curses-menus.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-menus.adb 2011-03-22 23:38:12.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-menus.adb 2014-05-24 21:31:05.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.28 $
---- $Date: 2011/03/22 23:38:12 $
-+-- $Revision: 1.32 $
-+-- $Date: 2014/05/24 21:31:05 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Ada.Unchecked_Deallocation;
-@@ -46,8 +46,6 @@
- with Interfaces.C.Strings; use Interfaces.C.Strings;
- with Interfaces.C.Pointers;
-
--with Ada.Unchecked_Conversion;
--
- package body Terminal_Interface.Curses.Menus is
-
- type C_Item_Array is array (Natural range <>) of aliased Item;
-@@ -57,22 +55,6 @@
- use type System.Bit_Order;
- subtype chars_ptr is Interfaces.C.Strings.chars_ptr;
-
-- function MOS_2_CInt is new
-- Ada.Unchecked_Conversion (Menu_Option_Set,
-- C_Int);
--
-- function CInt_2_MOS is new
-- Ada.Unchecked_Conversion (C_Int,
-- Menu_Option_Set);
--
-- function IOS_2_CInt is new
-- Ada.Unchecked_Conversion (Item_Option_Set,
-- C_Int);
--
-- function CInt_2_IOS is new
-- Ada.Unchecked_Conversion (C_Int,
-- Item_Option_Set);
--
- ------------------------------------------------------------------------------
- procedure Request_Name (Key : Menu_Request_Code;
- Name : out String)
-@@ -128,10 +110,9 @@
- function Itemname (Itm : Item) return chars_ptr;
- pragma Import (C, Itemname, "item_name");
-
-- function Freeitem (Itm : Item) return C_Int;
-+ function Freeitem (Itm : Item) return Eti_Error;
- pragma Import (C, Freeitem, "free_item");
-
-- Res : Eti_Error;
- Ptr : chars_ptr;
- begin
- Ptr := Descname (Itm);
-@@ -142,10 +123,7 @@
- if Ptr /= Null_Ptr then
- Interfaces.C.Strings.Free (Ptr);
- end if;
-- Res := Freeitem (Itm);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Freeitem (Itm));
- Itm := Null_Item;
- end Delete;
- -------------------------------------------------------------------------------
-@@ -153,14 +131,11 @@
- Value : Boolean := True)
- is
- function Set_Item_Val (Itm : Item;
-- Val : C_Int) return C_Int;
-+ Val : C_Int) return Eti_Error;
- pragma Import (C, Set_Item_Val, "set_item_value");
-
-- Res : constant Eti_Error := Set_Item_Val (Itm, Boolean'Pos (Value));
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Item_Val (Itm, Boolean'Pos (Value)));
- end Set_Value;
-
- function Value (Itm : Item) return Boolean
-@@ -192,16 +167,11 @@
- Options : Item_Option_Set)
- is
- function Set_Item_Opts (Itm : Item;
-- Opt : C_Int) return C_Int;
-+ Opt : Item_Option_Set) return Eti_Error;
- pragma Import (C, Set_Item_Opts, "set_item_opts");
-
-- Opt : constant C_Int := IOS_2_CInt (Options);
-- Res : Eti_Error;
- begin
-- Res := Set_Item_Opts (Itm, Opt);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Item_Opts (Itm, Options));
- end Set_Options;
-
- procedure Switch_Options (Itm : Item;
-@@ -209,34 +179,28 @@
- On : Boolean := True)
- is
- function Item_Opts_On (Itm : Item;
-- Opt : C_Int) return C_Int;
-+ Opt : Item_Option_Set) return Eti_Error;
- pragma Import (C, Item_Opts_On, "item_opts_on");
- function Item_Opts_Off (Itm : Item;
-- Opt : C_Int) return C_Int;
-+ Opt : Item_Option_Set) return Eti_Error;
- pragma Import (C, Item_Opts_Off, "item_opts_off");
-
-- Opt : constant C_Int := IOS_2_CInt (Options);
-- Err : Eti_Error;
- begin
- if On then
-- Err := Item_Opts_On (Itm, Opt);
-+ Eti_Exception (Item_Opts_On (Itm, Options));
- else
-- Err := Item_Opts_Off (Itm, Opt);
-- end if;
-- if Err /= E_Ok then
-- Eti_Exception (Err);
-+ Eti_Exception (Item_Opts_Off (Itm, Options));
- end if;
- end Switch_Options;
-
- procedure Get_Options (Itm : Item;
- Options : out Item_Option_Set)
- is
-- function Item_Opts (Itm : Item) return C_Int;
-+ function Item_Opts (Itm : Item) return Item_Option_Set;
- pragma Import (C, Item_Opts, "item_opts");
-
-- Res : constant C_Int := Item_Opts (Itm);
- begin
-- Options := CInt_2_IOS (Res);
-+ Options := Item_Opts (Itm);
- end Get_Options;
-
- function Get_Options (Itm : Item := Null_Item) return Item_Option_Set
-@@ -285,14 +249,11 @@
- Itm : Item)
- is
- function Set_Curr_Item (Men : Menu;
-- Itm : Item) return C_Int;
-+ Itm : Item) return Eti_Error;
- pragma Import (C, Set_Curr_Item, "set_current_item");
-
-- Res : constant Eti_Error := Set_Curr_Item (Men, Itm);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Curr_Item (Men, Itm));
- end Set_Current;
-
- function Current (Men : Menu) return Item
-@@ -312,14 +273,11 @@
- Line : Line_Position)
- is
- function Set_Toprow (Men : Menu;
-- Line : C_Int) return C_Int;
-+ Line : C_Int) return Eti_Error;
- pragma Import (C, Set_Toprow, "set_top_row");
-
-- Res : constant Eti_Error := Set_Toprow (Men, C_Int (Line));
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Toprow (Men, C_Int (Line)));
- end Set_Top_Row;
-
- function Top_Row (Men : Menu) return Line_Position
-@@ -351,20 +309,16 @@
- procedure Post (Men : Menu;
- Post : Boolean := True)
- is
-- function M_Post (Men : Menu) return C_Int;
-+ function M_Post (Men : Menu) return Eti_Error;
- pragma Import (C, M_Post, "post_menu");
-- function M_Unpost (Men : Menu) return C_Int;
-+ function M_Unpost (Men : Menu) return Eti_Error;
- pragma Import (C, M_Unpost, "unpost_menu");
-
-- Res : Eti_Error;
- begin
- if Post then
-- Res := M_Post (Men);
-+ Eti_Exception (M_Post (Men));
- else
-- Res := M_Unpost (Men);
-- end if;
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-+ Eti_Exception (M_Unpost (Men));
- end if;
- end Post;
- -------------------------------------------------------------------------------
-@@ -372,16 +326,11 @@
- Options : Menu_Option_Set)
- is
- function Set_Menu_Opts (Men : Menu;
-- Opt : C_Int) return C_Int;
-+ Opt : Menu_Option_Set) return Eti_Error;
- pragma Import (C, Set_Menu_Opts, "set_menu_opts");
-
-- Opt : constant C_Int := MOS_2_CInt (Options);
-- Res : Eti_Error;
- begin
-- Res := Set_Menu_Opts (Men, Opt);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Menu_Opts (Men, Options));
- end Set_Options;
-
- procedure Switch_Options (Men : Menu;
-@@ -389,34 +338,28 @@
- On : Boolean := True)
- is
- function Menu_Opts_On (Men : Menu;
-- Opt : C_Int) return C_Int;
-+ Opt : Menu_Option_Set) return Eti_Error;
- pragma Import (C, Menu_Opts_On, "menu_opts_on");
- function Menu_Opts_Off (Men : Menu;
-- Opt : C_Int) return C_Int;
-+ Opt : Menu_Option_Set) return Eti_Error;
- pragma Import (C, Menu_Opts_Off, "menu_opts_off");
-
-- Opt : constant C_Int := MOS_2_CInt (Options);
-- Err : Eti_Error;
- begin
- if On then
-- Err := Menu_Opts_On (Men, Opt);
-+ Eti_Exception (Menu_Opts_On (Men, Options));
- else
-- Err := Menu_Opts_Off (Men, Opt);
-- end if;
-- if Err /= E_Ok then
-- Eti_Exception (Err);
-+ Eti_Exception (Menu_Opts_Off (Men, Options));
- end if;
- end Switch_Options;
-
- procedure Get_Options (Men : Menu;
- Options : out Menu_Option_Set)
- is
-- function Menu_Opts (Men : Menu) return C_Int;
-+ function Menu_Opts (Men : Menu) return Menu_Option_Set;
- pragma Import (C, Menu_Opts, "menu_opts");
-
-- Res : constant C_Int := Menu_Opts (Men);
- begin
-- Options := CInt_2_MOS (Res);
-+ Options := Menu_Opts (Men);
- end Get_Options;
-
- function Get_Options (Men : Menu := Null_Menu) return Menu_Option_Set
-@@ -431,14 +374,11 @@
- Win : Window)
- is
- function Set_Menu_Win (Men : Menu;
-- Win : Window) return C_Int;
-+ Win : Window) return Eti_Error;
- pragma Import (C, Set_Menu_Win, "set_menu_win");
-
-- Res : constant Eti_Error := Set_Menu_Win (Men, Win);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Menu_Win (Men, Win));
- end Set_Window;
-
- function Get_Window (Men : Menu) return Window
-@@ -455,14 +395,11 @@
- Win : Window)
- is
- function Set_Menu_Sub (Men : Menu;
-- Win : Window) return C_Int;
-+ Win : Window) return Eti_Error;
- pragma Import (C, Set_Menu_Sub, "set_menu_sub");
-
-- Res : constant Eti_Error := Set_Menu_Sub (Men, Win);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Menu_Sub (Men, Win));
- end Set_Sub_Window;
-
- function Get_Sub_Window (Men : Menu) return Window
-@@ -481,29 +418,23 @@
- is
- type C_Int_Access is access all C_Int;
- function M_Scale (Men : Menu;
-- Yp, Xp : C_Int_Access) return C_Int;
-+ Yp, Xp : C_Int_Access) return Eti_Error;
- pragma Import (C, M_Scale, "scale_menu");
-
- X, Y : aliased C_Int;
-- Res : constant Eti_Error := M_Scale (Men, Y'Access, X'Access);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (M_Scale (Men, Y'Access, X'Access));
- Lines := Line_Count (Y);
- Columns := Column_Count (X);
- end Scale;
- -------------------------------------------------------------------------------
- procedure Position_Cursor (Men : Menu)
- is
-- function Pos_Menu_Cursor (Men : Menu) return C_Int;
-+ function Pos_Menu_Cursor (Men : Menu) return Eti_Error;
- pragma Import (C, Pos_Menu_Cursor, "pos_menu_cursor");
-
-- Res : constant Eti_Error := Pos_Menu_Cursor (Men);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Pos_Menu_Cursor (Men));
- end Position_Cursor;
-
- -------------------------------------------------------------------------------
-@@ -512,18 +443,14 @@
- is
- type Char_Ptr is access all Interfaces.C.char;
- function Set_Mark (Men : Menu;
-- Mark : Char_Ptr) return C_Int;
-+ Mark : Char_Ptr) return Eti_Error;
- pragma Import (C, Set_Mark, "set_menu_mark");
-
- Txt : char_array (0 .. Mark'Length);
- Len : size_t;
-- Res : Eti_Error;
- begin
- To_C (Mark, Txt, Len);
-- Res := Set_Mark (Men, Txt (Txt'First)'Access);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Mark (Men, Txt (Txt'First)'Access));
- end Set_Mark;
-
- procedure Mark (Men : Menu;
-@@ -550,37 +477,34 @@
- Color : Color_Pair := Color_Pair'First)
- is
- function Set_Menu_Fore (Men : Menu;
-- Attr : C_Chtype) return C_Int;
-+ Attr : Attributed_Character) return Eti_Error;
- pragma Import (C, Set_Menu_Fore, "set_menu_fore");
-
- Ch : constant Attributed_Character := (Ch => Character'First,
- Color => Color,
- Attr => Fore);
-- Res : constant Eti_Error := Set_Menu_Fore (Men, AttrChar_To_Chtype (Ch));
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Menu_Fore (Men, Ch));
- end Set_Foreground;
-
- procedure Foreground (Men : Menu;
- Fore : out Character_Attribute_Set)
- is
-- function Menu_Fore (Men : Menu) return C_Chtype;
-+ function Menu_Fore (Men : Menu) return Attributed_Character;
- pragma Import (C, Menu_Fore, "menu_fore");
- begin
-- Fore := Chtype_To_AttrChar (Menu_Fore (Men)).Attr;
-+ Fore := Menu_Fore (Men).Attr;
- end Foreground;
-
- procedure Foreground (Men : Menu;
- Fore : out Character_Attribute_Set;
- Color : out Color_Pair)
- is
-- function Menu_Fore (Men : Menu) return C_Chtype;
-+ function Menu_Fore (Men : Menu) return Attributed_Character;
- pragma Import (C, Menu_Fore, "menu_fore");
- begin
-- Fore := Chtype_To_AttrChar (Menu_Fore (Men)).Attr;
-- Color := Chtype_To_AttrChar (Menu_Fore (Men)).Color;
-+ Fore := Menu_Fore (Men).Attr;
-+ Color := Menu_Fore (Men).Color;
- end Foreground;
-
- procedure Set_Background
-@@ -589,37 +513,34 @@
- Color : Color_Pair := Color_Pair'First)
- is
- function Set_Menu_Back (Men : Menu;
-- Attr : C_Chtype) return C_Int;
-+ Attr : Attributed_Character) return Eti_Error;
- pragma Import (C, Set_Menu_Back, "set_menu_back");
-
- Ch : constant Attributed_Character := (Ch => Character'First,
- Color => Color,
- Attr => Back);
-- Res : constant Eti_Error := Set_Menu_Back (Men, AttrChar_To_Chtype (Ch));
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Menu_Back (Men, Ch));
- end Set_Background;
-
- procedure Background (Men : Menu;
- Back : out Character_Attribute_Set)
- is
-- function Menu_Back (Men : Menu) return C_Chtype;
-+ function Menu_Back (Men : Menu) return Attributed_Character;
- pragma Import (C, Menu_Back, "menu_back");
- begin
-- Back := Chtype_To_AttrChar (Menu_Back (Men)).Attr;
-+ Back := Menu_Back (Men).Attr;
- end Background;
-
- procedure Background (Men : Menu;
- Back : out Character_Attribute_Set;
- Color : out Color_Pair)
- is
-- function Menu_Back (Men : Menu) return C_Chtype;
-+ function Menu_Back (Men : Menu) return Attributed_Character;
- pragma Import (C, Menu_Back, "menu_back");
- begin
-- Back := Chtype_To_AttrChar (Menu_Back (Men)).Attr;
-- Color := Chtype_To_AttrChar (Menu_Back (Men)).Color;
-+ Back := Menu_Back (Men).Attr;
-+ Color := Menu_Back (Men).Color;
- end Background;
-
- procedure Set_Grey (Men : Menu;
-@@ -627,53 +548,46 @@
- Color : Color_Pair := Color_Pair'First)
- is
- function Set_Menu_Grey (Men : Menu;
-- Attr : C_Chtype) return C_Int;
-+ Attr : Attributed_Character) return Eti_Error;
- pragma Import (C, Set_Menu_Grey, "set_menu_grey");
-
- Ch : constant Attributed_Character := (Ch => Character'First,
- Color => Color,
- Attr => Grey);
-
-- Res : constant Eti_Error := Set_Menu_Grey (Men, AttrChar_To_Chtype (Ch));
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Menu_Grey (Men, Ch));
- end Set_Grey;
-
- procedure Grey (Men : Menu;
- Grey : out Character_Attribute_Set)
- is
-- function Menu_Grey (Men : Menu) return C_Chtype;
-+ function Menu_Grey (Men : Menu) return Attributed_Character;
- pragma Import (C, Menu_Grey, "menu_grey");
- begin
-- Grey := Chtype_To_AttrChar (Menu_Grey (Men)).Attr;
-+ Grey := Menu_Grey (Men).Attr;
- end Grey;
-
- procedure Grey (Men : Menu;
- Grey : out Character_Attribute_Set;
- Color : out Color_Pair)
- is
-- function Menu_Grey (Men : Menu) return C_Chtype;
-+ function Menu_Grey (Men : Menu) return Attributed_Character;
- pragma Import (C, Menu_Grey, "menu_grey");
- begin
-- Grey := Chtype_To_AttrChar (Menu_Grey (Men)).Attr;
-- Color := Chtype_To_AttrChar (Menu_Grey (Men)).Color;
-+ Grey := Menu_Grey (Men).Attr;
-+ Color := Menu_Grey (Men).Color;
- end Grey;
-
- procedure Set_Pad_Character (Men : Menu;
- Pad : Character := Space)
- is
- function Set_Menu_Pad (Men : Menu;
-- Ch : C_Int) return C_Int;
-+ Ch : C_Int) return Eti_Error;
- pragma Import (C, Set_Menu_Pad, "set_menu_pad");
-
-- Res : constant Eti_Error := Set_Menu_Pad (Men,
-- C_Int (Character'Pos (Pad)));
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Menu_Pad (Men, C_Int (Character'Pos (Pad))));
- end Set_Pad_Character;
-
- procedure Pad_Character (Men : Menu;
-@@ -691,17 +605,14 @@
- Col : Column_Position := 0)
- is
- function Set_Spacing (Men : Menu;
-- D, R, C : C_Int) return C_Int;
-+ D, R, C : C_Int) return Eti_Error;
- pragma Import (C, Set_Spacing, "set_menu_spacing");
-
-- Res : constant Eti_Error := Set_Spacing (Men,
-- C_Int (Descr),
-- C_Int (Row),
-- C_Int (Col));
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Spacing (Men,
-+ C_Int (Descr),
-+ C_Int (Row),
-+ C_Int (Col)));
- end Set_Spacing;
-
- procedure Spacing (Men : Menu;
-@@ -711,22 +622,18 @@
- is
- type C_Int_Access is access all C_Int;
- function Get_Spacing (Men : Menu;
-- D, R, C : C_Int_Access) return C_Int;
-+ D, R, C : C_Int_Access) return Eti_Error;
- pragma Import (C, Get_Spacing, "menu_spacing");
-
- D, R, C : aliased C_Int;
-- Res : constant Eti_Error := Get_Spacing (Men,
-- D'Access,
-- R'Access,
-- C'Access);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- else
-- Descr := Column_Position (D);
-- Row := Line_Position (R);
-- Col := Column_Position (C);
-- end if;
-+ Eti_Exception (Get_Spacing (Men,
-+ D'Access,
-+ R'Access,
-+ C'Access));
-+ Descr := Column_Position (D);
-+ Row := Line_Position (R);
-+ Col := Column_Position (C);
- end Spacing;
- -------------------------------------------------------------------------------
- function Set_Pattern (Men : Menu;
-@@ -734,7 +641,7 @@
- is
- type Char_Ptr is access all Interfaces.C.char;
- function Set_Pattern (Men : Menu;
-- Pattern : Char_Ptr) return C_Int;
-+ Pattern : Char_Ptr) return Eti_Error;
- pragma Import (C, Set_Pattern, "set_menu_pattern");
-
- S : char_array (0 .. Text'Length);
-@@ -744,11 +651,11 @@
- To_C (Text, S, L);
- Res := Set_Pattern (Men, S (S'First)'Access);
- case Res is
-- when E_No_Match => return False;
-- when E_Ok => return True;
-+ when E_No_Match =>
-+ return False;
- when others =>
- Eti_Exception (Res);
-- return False;
-+ return True;
- end case;
- end Set_Pattern;
-
-@@ -767,16 +674,14 @@
- is
- function Set_Menu_Fmt (Men : Menu;
- Lin : C_Int;
-- Col : C_Int) return C_Int;
-+ Col : C_Int) return Eti_Error;
- pragma Import (C, Set_Menu_Fmt, "set_menu_format");
-
-- Res : constant Eti_Error := Set_Menu_Fmt (Men,
-- C_Int (Lines),
-- C_Int (Columns));
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Menu_Fmt (Men,
-+ C_Int (Lines),
-+ C_Int (Columns)));
-+
- end Set_Format;
-
- procedure Format (Men : Menu;
-@@ -785,74 +690,58 @@
- is
- type C_Int_Access is access all C_Int;
- function Menu_Fmt (Men : Menu;
-- Y, X : C_Int_Access) return C_Int;
-+ Y, X : C_Int_Access) return Eti_Error;
- pragma Import (C, Menu_Fmt, "menu_format");
-
- L, C : aliased C_Int;
-- Res : constant Eti_Error := Menu_Fmt (Men, L'Access, C'Access);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- else
-- Lines := Line_Count (L);
-- Columns := Column_Count (C);
-- end if;
-+ Eti_Exception (Menu_Fmt (Men, L'Access, C'Access));
-+ Lines := Line_Count (L);
-+ Columns := Column_Count (C);
- end Format;
- -------------------------------------------------------------------------------
- procedure Set_Item_Init_Hook (Men : Menu;
- Proc : Menu_Hook_Function)
- is
- function Set_Item_Init (Men : Menu;
-- Proc : Menu_Hook_Function) return C_Int;
-+ Proc : Menu_Hook_Function) return Eti_Error;
- pragma Import (C, Set_Item_Init, "set_item_init");
-
-- Res : constant Eti_Error := Set_Item_Init (Men, Proc);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Item_Init (Men, Proc));
- end Set_Item_Init_Hook;
-
- procedure Set_Item_Term_Hook (Men : Menu;
- Proc : Menu_Hook_Function)
- is
- function Set_Item_Term (Men : Menu;
-- Proc : Menu_Hook_Function) return C_Int;
-+ Proc : Menu_Hook_Function) return Eti_Error;
- pragma Import (C, Set_Item_Term, "set_item_term");
-
-- Res : constant Eti_Error := Set_Item_Term (Men, Proc);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Item_Term (Men, Proc));
- end Set_Item_Term_Hook;
-
- procedure Set_Menu_Init_Hook (Men : Menu;
- Proc : Menu_Hook_Function)
- is
- function Set_Menu_Init (Men : Menu;
-- Proc : Menu_Hook_Function) return C_Int;
-+ Proc : Menu_Hook_Function) return Eti_Error;
- pragma Import (C, Set_Menu_Init, "set_menu_init");
-
-- Res : constant Eti_Error := Set_Menu_Init (Men, Proc);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Menu_Init (Men, Proc));
- end Set_Menu_Init_Hook;
-
- procedure Set_Menu_Term_Hook (Men : Menu;
- Proc : Menu_Hook_Function)
- is
- function Set_Menu_Term (Men : Menu;
-- Proc : Menu_Hook_Function) return C_Int;
-+ Proc : Menu_Hook_Function) return Eti_Error;
- pragma Import (C, Set_Menu_Term, "set_menu_term");
-
-- Res : constant Eti_Error := Set_Menu_Term (Men, Proc);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Menu_Term (Men, Proc));
- end Set_Menu_Term_Hook;
-
- function Get_Item_Init_Hook (Men : Menu) return Menu_Hook_Function
-@@ -891,19 +780,15 @@
- Items : Item_Array_Access)
- is
- function Set_Items (Men : Menu;
-- Items : System.Address) return C_Int;
-+ Items : System.Address) return Eti_Error;
- pragma Import (C, Set_Items, "set_menu_items");
-
-- Res : Eti_Error;
- begin
- pragma Assert (Items.all (Items'Last) = Null_Item);
- if Items.all (Items'Last) /= Null_Item then
- raise Menu_Exception;
- else
-- Res := Set_Items (Men, Items.all'Address);
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Set_Items (Men, Items.all'Address));
- end if;
- end Redefine;
-
-@@ -955,14 +840,11 @@
-
- procedure Delete (Men : in out Menu)
- is
-- function Free (Men : Menu) return C_Int;
-+ function Free (Men : Menu) return Eti_Error;
- pragma Import (C, Free, "free_menu");
-
-- Res : constant Eti_Error := Free (Men);
- begin
-- if Res /= E_Ok then
-- Eti_Exception (Res);
-- end if;
-+ Eti_Exception (Free (Men));
- Men := Null_Menu;
- end Delete;
-
-@@ -971,22 +853,22 @@
- Key : Key_Code) return Driver_Result
- is
- function Driver (Men : Menu;
-- Key : C_Int) return C_Int;
-+ Key : C_Int) return Eti_Error;
- pragma Import (C, Driver, "menu_driver");
-
- R : constant Eti_Error := Driver (Men, C_Int (Key));
- begin
-- if R /= E_Ok then
-- case R is
-- when E_Unknown_Command => return Unknown_Request;
-- when E_No_Match => return No_Match;
-- when E_Request_Denied |
-- E_Not_Selectable => return Request_Denied;
-- when others =>
-- Eti_Exception (R);
-- end case;
-- end if;
-- return Menu_Ok;
-+ case R is
-+ when E_Unknown_Command =>
-+ return Unknown_Request;
-+ when E_No_Match =>
-+ return No_Match;
-+ when E_Request_Denied | E_Not_Selectable =>
-+ return Request_Denied;
-+ when others =>
-+ Eti_Exception (R);
-+ return Menu_Ok;
-+ end case;
- end Driver;
-
- procedure Free (IA : in out Item_Array_Access;
-Index: Ada95/src/terminal_interface-curses-mouse.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-mouse.adb 2009-12-26 17:38:58.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-mouse.adb 2014-09-13 19:10:18.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2009,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.24 $
---- $Date: 2009/12/26 17:38:58 $
-+-- $Revision: 1.25 $
-+-- $Date: 2014/09/13 19:10:18 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
-@@ -199,7 +199,8 @@
- pragma Import (C, Wenclose, "wenclose");
- begin
- if Wenclose (Win, C_Int (Event.Y), C_Int (Event.X))
-- = Curses_Bool_False then
-+ = Curses_Bool_False
-+ then
- return False;
- else
- return True;
-Index: Ada95/src/terminal_interface-curses-text_io.adb
---- ncurses-5.9/Ada95/src/terminal_interface-curses-text_io.adb 2011-03-22 23:38:49.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-text_io.adb 2014-05-24 21:32:18.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2011,2014 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 --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.20 $
---- $Date: 2011/03/22 23:38:49 $
-+-- $Revision: 1.22 $
-+-- $Date: 2014/05/24 21:32:18 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- package body Terminal_Interface.Curses.Text_IO is
-@@ -205,7 +205,7 @@
- end if;
-
- Get_Cursor_Position (Win, Y1, X);
-- pragma Unreferenced (X);
-+ pragma Warnings (Off, X); -- unreferenced
- N := Natural (To); N := N - 1;
- Y2 := Line_Position (N);
- if Y2 < Y1 then
-Index: Ada95/src/terminal_interface-curses-trace.adb_p
---- ncurses-5.9/Ada95/src/terminal_interface-curses-trace.adb_p 2011-03-19 18:16:43.000000000 +0000
-+++ ncurses-5.9-20141206/Ada95/src/terminal_interface-curses-trace.adb_p 2014-05-24 21:31:57.000000000 +0000
-@@ -7,7 +7,7 @@
- -- B O D Y --
- -- --
- ------------------------------------------------------------------------------
---- Copyright (c) 2000-2004,2009 Free Software Foundation, Inc. --
-+-- Copyright (c) 2000-2009,2014 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 --
-@@ -35,60 +35,39 @@
- ------------------------------------------------------------------------------
- -- Author: Juergen Pfeifer, 1996
- -- Version Control:
---- $Revision: 1.7 $
-+-- $Revision: 1.11 $
- -- Binding Version 01.00
- ------------------------------------------------------------------------------
- #if ADA_TRACE then
- with Interfaces.C; use Interfaces.C;
--with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
--with Ada.Unchecked_Conversion;
- #end if;
-
- package body Terminal_Interface.Curses.Trace is
-
- #if ADA_TRACE then
-- type C_TraceType is new C_UInt;
--
-- function TraceAda_To_TraceC is new
-- Ada.Unchecked_Conversion (Source => Trace_Attribute_Set,
-- Target => C_TraceType);
--
- procedure Trace_On (x : Trace_Attribute_Set) is
-- procedure traceC (y : C_TraceType);
-+ procedure traceC (y : Trace_Attribute_Set);
- pragma Import (C, traceC, "trace");
- begin
-- traceC (TraceAda_To_TraceC (x));
-+ traceC (x);
- end Trace_On;
-
-- -- 75. (12) A C function that takes a variable number of arguments can
-- -- correspond to several Ada subprograms, taking various specific
-- -- numbers and types of parameters.
--
- procedure Trace_Put (str : String) is
- procedure tracef (format : char_array; s : char_array);
- pragma Import (C, tracef, "_traces");
-- Txt : char_array (0 .. str'Length);
-- Length : size_t;
-- formatstr : constant String := "%s" & ASCII.NUL;
-- formattxt : char_array (0 .. formatstr'Length);
-+ -- _traces() is defined in c_varargs_to_ada.h
- begin
-- To_C (formatstr, formattxt, Length);
-- To_C (str, Txt, Length);
-- tracef (formattxt, Txt);
-+ tracef (To_C ("%s"), To_C (str));
- end Trace_Put;
- #else
- procedure Trace_On (x : Trace_Attribute_Set) is
--#if PRAGMA_UNREF
-- pragma Unreferenced (x);
--#end if;
-+ pragma Warnings (Off, x); -- unreferenced
- begin
- null;
- end Trace_On;
-
- procedure Trace_Put (str : String) is
--#if PRAGMA_UNREF
-- pragma Unreferenced (str);
--#end if;
-+ pragma Warnings (Off, str); -- unreferenced
- begin
- null;
- end Trace_Put;
-Index: COPYING
---- /dev/null 2014-12-07 11:09:34.027922031 +0000
-+++ ncurses-5.9-20141206/COPYING 2014-01-18 23:59:29.000000000 +0000
-@@ -0,0 +1,28 @@
-+Copyright (c) 1998-2013,2014 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"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, distribute with modifications, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included
-+in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Except as contained in this notice, the name(s) of the above copyright
-+holders shall not be used in advertising or otherwise to promote the
-+sale, use or other dealings in this Software without prior written
-+authorization.
-+
-+-- vile:txtmode fc=72
-+-- $Id: COPYING,v 1.2 2014/01/18 23:59:29 tom Exp $
-Index: INSTALL
-Prereq: 1.155
---- ncurses-5.9/INSTALL 2011-03-31 08:27:24.000000000 +0000
-+++ ncurses-5.9-20141206/INSTALL 2014-12-06 13:31:57.000000000 +0000
-@@ -1,5 +1,5 @@
- -------------------------------------------------------------------------------
---- Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2013,2014 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.179 2014/12/06 13:31:57 tom Exp $
- ---------------------------------------------------------------------
- How to install Ncurses/Terminfo on your system
- ---------------------------------------------------------------------
-@@ -315,6 +315,10 @@
- programs are useful in this configuration, e.g., reset and tput versus
- infocmp and tic.
-
-+ --disable-db-install
-+ Do not install the terminal database. This is used to omit features
-+ for packages, as done with --without-progs.
-+
- --disable-ext-funcs
- Disable function-extensions. Configure ncurses without the functions
- that are not specified by XSI. See ncurses/modules for the exact
-@@ -333,6 +337,10 @@
- --disable-largefile
- Disable compiler flags needed to use large-file interfaces.
-
-+ --disable-lib-suffixes
-+ Suppress the "w", "t" or "tw" suffixes which normally would be added
-+ to the library names for the --enable-widec and --with-pthread options.
-+
- --disable-libtool-version
- when using --with-libtool, control how the major/minor version numbers
- are used for constructing the library name.
-@@ -344,6 +352,10 @@
- Use --disable-libtool-version to use the libtool -version-info feature.
- This corresponds to the setting used before patch 20100515.
-
-+ Starting with patch 20141115, using this option causes the configure
-+ script to apply the top-level VERSION file to the ABI version used
-+ for libtool.
-+
- --disable-leaks
- For testing, compile-in code that frees memory that normally would not
- be freed, to simplify analysis of memory-leaks.
-@@ -352,11 +364,17 @@
- a screen, since (even after calling endwin()), it must be available
- for use in the next call to refresh(). There are also chunks of
- memory held for performance reasons. That makes it hard to analyze
-- curses applications for memory leaks. To work around this, build
-- a debugging version of the ncurses library which frees those chunks
-+ curses applications for memory leaks. To work around this, build a
-+ debugging version of the ncurses library which frees those chunks
- which it can, and provides the _nc_free_and_exit() function to free
-- the remainder on exit. The ncurses utility and test programs use this
-- feature, e.g., via the ExitProgram() macro.
-+ the remainder and then exit. The ncurses utility and test programs
-+ use this feature, e.g., via the ExitProgram() macro.
-+
-+ Because this lies outside of the library's intended usage, it is not
-+ normally considered part of the ABI. If there were some (as yet
-+ unplanned) extension which frees memory in a manner that would let the
-+ library resume and reallocate memory, then that would not use a "_nc_"
-+ prefix.
-
- --disable-lp64
- The header files will ignore use of the _LP64 symbol to make chtype
-@@ -382,6 +400,37 @@
- rather than the include directory. This makes it simpler to avoid
- compile-time conflicts with other versions of curses.h
-
-+ Putting the header files into a subdirectory assumes that applications
-+ will follow the (standard) practice of including the headers with
-+ reference to the subdirectory name. For instance, the normal ncurses
-+ header would be included using
-+
-+ #include
-+ #include
-+
-+ while the ncursesw headers would be found this way:
-+
-+ #include
-+ #include
-+
-+ In either case (with or without the --disable-overwrite option),
-+ almost all applications are designed to include a related set of
-+ curses header files from the same directory.
-+
-+ Manipulating the --includedir configure option to put header files
-+ directly in a subdirectory of the normal include-directory defeats
-+ this, and breaks builds of portable applications. Likewise, putting
-+ some headers in /usr/include, and others in a subdirectory is a good
-+ way to break builds.
-+
-+ When configured with --disable-overwrite, the installed header files'
-+ embedded #include's are adjusted to use the same style of includes
-+ noted above. In particular, the unctrl.h header is included from
-+ curses.h, which means that a makefile which tells the compiler to
-+ include directly from the subdirectory will fail to compile correctly.
-+ Without some special effort, it will either fail to compile at all,
-+ or the compiler may find a different unctrl.h file.
-+
- --disable-relink
- If --enable-rpath is given, the generated makefiles normally will
- rebuild the libraries during install. Use this option to simply
-@@ -407,13 +456,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 +605,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 +648,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 +677,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.
-
-@@ -740,6 +807,12 @@
- executables, e.g., by setting "--with-chtype=long" (the configure
- script supplies "unsigned").
-
-+ --with-cxx-shared
-+ When --with-shared is set, build libncurses++ as a shared library.
-+ This implicitly relies upon building with gcc/g++, since other
-+ compiler suites may have differences in the way shared libraries are
-+ built. libtool by the way has similar limitations.
-+
- --with-database=XXX
- Specify the terminfo source file to install. Usually you will wish
- to install ncurses' default (misc/terminfo.src). Certain systems
-@@ -762,6 +835,11 @@
- For testing, compile and link with Gray Watson's dmalloc library.
- This also sets the --disable-leaks option.
-
-+ --with-export-syms[=XXX]
-+ Limit exported symbols using libtool. The configure script
-+ automatically chooses an appropriate ".sym" file, which lists the
-+ symbols which are part of the ABI.
-+
- --with-fallbacks=XXX
- Specify a list of fallback terminal descriptions which will be
- compiled into the ncurses library. See CONFIGURING FALLBACK ENTRIES.
-@@ -805,10 +883,15 @@
- filesystem-based terminfo entries.
-
- Use the parameter value to give the install-prefix used for the
-- datbase, e.g.,
-+ database, e.g.,
- --with-hashed-db=/usr/local/BigBase
- to find the corresponding include- and lib-directories under the
-- given directory.
-+ given directory. Alternatively, you can specify a directory leaf
-+ name, e.g.,
-+ --with-hashed-db=db4
-+ to make the configure script look for files in a subdirectory such as
-+ /usr/include/db4/db.h
-+ /usr/lib/db4/libdb.so
-
- See also the --enable-getcap option.
-
-@@ -824,7 +907,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,
-@@ -842,6 +935,9 @@
- using the appropriate patch for autoconf from
- http://invisible-island.net/autoconf/
-
-+ --with-libtool-opts=XXX
-+ Specify additional libtool options.
-+
- --with-manpage-aliases
- Tell the configure script you wish to create entries in the
- man-directory for aliases to manpages which list them, e.g., the
-@@ -904,6 +1000,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
-@@ -936,11 +1036,23 @@
- shared libraries, you may encounter problems with the linker.
- For example, it may prevent you from running the build tree's
- copy of tic (for installing the terminfo database) because it
-- loads the system's copy of the ncurses shared libraries. In that
-- case, using the misc/shlib script may be helpful, since it sets
-- $LD_LIBRARY_PATH to point to the build tree, e.g.,
-+ loads the system's copy of the ncurses shared libraries.
-+
-+ In that case, using the misc/shlib script may be helpful, since it
-+ sets $LD_LIBRARY_PATH to point to the build tree, e.g.,
-+
- ./misc/shlib make install
-
-+ Alternatively, for most platforms, the linker accepts a list of
-+ directories which will be searched for libraries at run-time. The
-+ configure script allows you to modify this list using the
-+ RPATH_LIST environment variable. It is a colon-separated list of
-+ directories (default: the "libdir" set via the configure script).
-+ If you set that to put "../lib" first in the list, the linker will
-+ look first at the build-directory, and avoid conflict with libraries
-+ already installed. One drawback to this approach is that libraries
-+ can be accidentally searched in any "../lib" directory.
-+
- NOTE: If you use the --with-ada-sharedlib option, you should also
- set this option, to ensure that C-language modules needed for the
- Ada binding use appropriate compiler options.
-@@ -996,10 +1108,40 @@
- 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-versioned-syms[=XXX]
-+ The Solaris, GNU and reportedly some other linkers (ld) accept a
-+ "--version-script" option which tells the linker to annotate the
-+ resulting objects with version identifiers. The configure script
-+ will automatically apply a suitable ".map" file to provide this
-+ information for Linux. Solaris mapfiles differ:
-+
-+ a) comments are not accepted
-+ b) wildcards are not accepted
-+ c) each symbol listed in the map file must exist in the library
-+
-+ Use "objdump -T" on a library to see the annotations.
-+
-+ --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 +1166,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 +1870,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
-Index: MANIFEST
---- ncurses-5.9/MANIFEST 2011-03-28 00:29:04.000000000 +0000
-+++ ncurses-5.9-20141206/MANIFEST 2014-11-15 14:03:59.000000000 +0000
-@@ -128,6 +128,8 @@
- ./Ada95/samples/tour.adb
- ./Ada95/samples/tour.ads
- ./Ada95/src/Makefile.in
-+./Ada95/src/c_threaded_variables.c
-+./Ada95/src/c_threaded_variables.h
- ./Ada95/src/c_varargs_to_ada.c
- ./Ada95/src/c_varargs_to_ada.h
- ./Ada95/src/library.gpr
-@@ -190,6 +192,7 @@
- ./Ada95/src/terminal_interface-curses-text_io.ads
- ./Ada95/src/terminal_interface-curses-trace.adb_p
- ./Ada95/src/terminal_interface.ads
-+./COPYING
- ./INSTALL
- ./MANIFEST
- ./Makefile.in
-@@ -199,6 +202,7 @@
- ./README.MinGW
- ./README.emx
- ./TO-DO
-+./VERSION
- ./aclocal.m4
- ./announce.html.in
- ./c++/Makefile.in
-@@ -332,6 +336,7 @@
- ./doc/html/ada/terminal_interface-curses-trace__ads.htm
- ./doc/html/ada/terminal_interface-curses__adb.htm
- ./doc/html/ada/terminal_interface-curses__ads.htm
-+./doc/html/ada/terminal_interface-curses_constants__ads.htm
- ./doc/html/ada/terminal_interface__ads.htm
- ./doc/html/announce.html
- ./doc/html/hackguide.html
-@@ -545,6 +550,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
-@@ -656,6 +663,8 @@
- ./man/legacy_coding.3x
- ./man/make_sed.sh
- ./man/man_db.renames
-+./man/manhtml.aliases
-+./man/manhtml.externs
- ./man/manlinks.sed
- ./man/menu.3x
- ./man/menu_attributes.3x
-@@ -764,7 +773,6 @@
- ./mk-0th.awk
- ./mk-1st.awk
- ./mk-2nd.awk
--./mk-dlls.sh.in
- ./mk-hdr.awk
- ./ncurses/Makefile.in
- ./ncurses/README
-@@ -850,7 +858,6 @@
- ./ncurses/base/lib_wattron.c
- ./ncurses/base/lib_winch.c
- ./ncurses/base/lib_window.c
--./ncurses/base/memmove.c
- ./ncurses/base/nc_panel.c
- ./ncurses/base/resizeterm.c
- ./ncurses/base/safe_sprintf.c
-@@ -867,6 +874,14 @@
- ./ncurses/llib-lncursest
- ./ncurses/llib-lncursestw
- ./ncurses/llib-lncursesw
-+./ncurses/llib-ltic
-+./ncurses/llib-ltict
-+./ncurses/llib-ltictw
-+./ncurses/llib-lticw
-+./ncurses/llib-ltinfo
-+./ncurses/llib-ltinfot
-+./ncurses/llib-ltinfotw
-+./ncurses/llib-ltinfow
- ./ncurses/modules
- ./ncurses/tinfo/MKcaptab.awk
- ./ncurses/tinfo/MKcaptab.sh
-@@ -915,10 +930,10 @@
- ./ncurses/tinfo/make_hash.c
- ./ncurses/tinfo/make_keys.c
- ./ncurses/tinfo/name_match.c
-+./ncurses/tinfo/obsolete.c
- ./ncurses/tinfo/parse_entry.c
- ./ncurses/tinfo/read_entry.c
- ./ncurses/tinfo/read_termcap.c
--./ncurses/tinfo/setbuf.c
- ./ncurses/tinfo/strings.c
- ./ncurses/tinfo/tinfo_driver.c
- ./ncurses/tinfo/trim_sgr0.c
-@@ -943,8 +958,6 @@
- ./ncurses/tty/lib_tstp.c
- ./ncurses/tty/lib_twait.c
- ./ncurses/tty/lib_vidattr.c
--./ncurses/tty/tty_display.h
--./ncurses/tty/tty_input.h
- ./ncurses/tty/tty_update.c
- ./ncurses/wcwidth.h
- ./ncurses/widechar/charable.c
-@@ -967,9 +980,42 @@
- ./ncurses/widechar/lib_vline_set.c
- ./ncurses/widechar/lib_wacs.c
- ./ncurses/widechar/lib_wunctrl.c
-+./ncurses/widechar/widechars.c
- ./ncurses/win32con/gettimeofday.c
- ./ncurses/win32con/wcwidth.c
- ./ncurses/win32con/win_driver.c
-+./package/debian-mingw/changelog
-+./package/debian-mingw/compat
-+./package/debian-mingw/control
-+./package/debian-mingw/copyright
-+./package/debian-mingw/rules
-+./package/debian-mingw/source/format
-+./package/debian-mingw/watch
-+./package/debian-mingw64/changelog
-+./package/debian-mingw64/compat
-+./package/debian-mingw64/control
-+./package/debian-mingw64/copyright
-+./package/debian-mingw64/rules
-+./package/debian-mingw64/source/format
-+./package/debian-mingw64/watch
-+./package/debian/changelog
-+./package/debian/compat
-+./package/debian/control
-+./package/debian/copyright
-+./package/debian/rules
-+./package/debian/source/format
-+./package/debian/watch
-+./package/mingw-ncurses.nsi
-+./package/mingw-ncurses.spec
-+./package/ncurses.map
-+./package/ncurses.spec
-+./package/ncurses.sym
-+./package/ncursest.map
-+./package/ncursest.sym
-+./package/ncursestw.map
-+./package/ncursestw.sym
-+./package/ncursesw.map
-+./package/ncursesw.sym
- ./panel/Makefile.in
- ./panel/headers
- ./panel/llib-lpanel
-@@ -1007,6 +1053,8 @@
- ./progs/tabs.c
- ./progs/tic.c
- ./progs/toe.c
-+./progs/tparm_type.c
-+./progs/tparm_type.h
- ./progs/tput.c
- ./progs/transform.c
- ./progs/tset.c
-@@ -1022,12 +1070,14 @@
- ./test/cardfile.dat
- ./test/chgat.c
- ./test/clip_printw.c
-+./test/color_name.h
- ./test/color_set.c
- ./test/configure
- ./test/configure.in
- ./test/demo_altkeys.c
- ./test/demo_defkey.c
- ./test/demo_forms.c
-+./test/demo_forms.txt
- ./test/demo_keyok.c
- ./test/demo_menus.c
- ./test/demo_panels.c
-@@ -1035,7 +1085,9 @@
- ./test/demo_terminfo.c
- ./test/ditto.c
- ./test/dots.c
-+./test/dots_curses.c
- ./test/dots_mvcur.c
-+./test/dots_termcap.c
- ./test/echochar.c
- ./test/edit_field.c
- ./test/edit_field.h
-@@ -1043,6 +1095,7 @@
- ./test/firework.c
- ./test/firstlast.c
- ./test/foldkeys.c
-+./test/form_driver_w.c
- ./test/gdc.6
- ./test/gdc.c
- ./test/hanoi.c
-@@ -1073,6 +1126,7 @@
- ./test/package/debian/rules
- ./test/package/debian/source/format
- ./test/package/debian/watch
-+./test/package/mingw-ncurses-examples.spec
- ./test/package/ncurses-examples.spec
- ./test/programs
- ./test/railroad.c
-@@ -1092,12 +1146,15 @@
- ./test/test_instr.c
- ./test/test_inwstr.c
- ./test/test_opaque.c
-+./test/test_vid_puts.c
-+./test/test_vidputs.c
- ./test/testaddch.c
- ./test/testcurs.c
- ./test/testscanw.c
- ./test/tracemunch
- ./test/view.c
- ./test/widechars-utf8.txt
-+./test/widechars.h
- ./test/worm.c
- ./test/xmas.c
- ./test/xterm-16color.dat
-Index: Makefile.in
-Prereq: 1.30
---- ncurses-5.9/Makefile.in 2010-11-27 21:45:27.000000000 +0000
-+++ ncurses-5.9-20141206/Makefile.in 2014-01-18 20:19:45.000000000 +0000
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.30 2010/11/27 21:45:27 tom Exp $
-+# $Id: Makefile.in,v 1.38 2014/01/18 20:19:45 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. #
-+# Copyright (c) 1998-2013,2014 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"), #
-@@ -27,7 +27,7 @@
- # authorization. #
- ##############################################################################
- #
--# Author: Thomas E. Dickey 1996,1997
-+# Author: Thomas E. Dickey 1996-on
- #
- # Master Makefile for ncurses library.
-
-@@ -35,7 +35,8 @@
- VPATH = @srcdir@
-
- DESTDIR=@DESTDIR@
--CF_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)"
-+RPATH_LIST=@RPATH_LIST@
-+TOP_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
-
- @SET_MAKE@
-
-@@ -48,13 +49,17 @@
-
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-+datarootdir = @datarootdir@
-
- bindir = @bindir@
- ticdir = @TERMINFO@
- includedir = @includedir@
-+includesubdir = @includesubdir@
- libdir = @libdir@
- mandir = @mandir@
-
-+include_dir = ${includedir}${includesubdir}
-+
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-
-@@ -74,25 +79,22 @@
- @ echo ''
- @ echo ' bin directory: '$(bindir)
- @ echo ' lib directory: '$(libdir)
-- @ echo ' include directory: '$(includedir)
-+ @ echo ' include directory: '$(include_dir)
- @ echo ' man directory: '$(mandir)
- @MAKE_TERMINFO@ @ echo ' terminfo directory: '$(ticdir)
- @ echo ''
-- @ test "$(includedir)" = "$(prefix)/include" || \
-+ @ test "$(include_dir)" = "$(prefix)/include" || \
- echo '** Include-directory is not in a standard location'
-- @ test ! -f $(includedir)/termcap.h || \
-- fgrep NCURSES_VERSION $(includedir)/termcap.h >/dev/null || \
-+ @ test ! -f $(include_dir)/termcap.h || \
-+ fgrep NCURSES_VERSION $(include_dir)/termcap.h >/dev/null || \
- echo '** Will overwrite non-ncurses termcap.h'
-- @ test ! -f $(includedir)/curses.h || \
-- fgrep NCURSES_VERSION $(includedir)/curses.h >/dev/null || \
-+ @ test ! -f $(include_dir)/curses.h || \
-+ fgrep NCURSES_VERSION $(include_dir)/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.
-Index: NEWS
-Prereq: 1.1682
---- ncurses-5.9/NEWS 2011-04-04 00:02:42.000000000 +0000
-+++ ncurses-5.9-20141206/NEWS 2014-12-06 23:03:44.000000000 +0000
-@@ -1,5 +1,5 @@
- -------------------------------------------------------------------------------
---- Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. --
-+-- Copyright (c) 1998-2013,2014 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.2307 2014/12/06 23:03:44 tom Exp $
- -------------------------------------------------------------------------------
-
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,1705 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
-
-+20141206
-+ + updated ".map" files so that each symbol that may be shared across
-+ the different library configurations has the same label. Some
-+ review is needed to ensure these are really compatible.
-+ + modify MKlib_gen.sh to work around change in development version of
-+ gcc introduced here:
-+ https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
-+ https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
-+ (reports by Marcus Shawcroft, Maohui Lei).
-+ + improved configure macro CF_SUBDIR_PATH, from lynx changes.
-+
-+20141129
-+ + improved ".map" files by generating them with a script that builds
-+ ncurses with several related configurations and merges the results.
-+ A further refinement is planned, to make the tic- and tinfo-library
-+ symbols use the same versions across each of the four configurations
-+ which are represented (reports by Sven Joachim, Werner Fink).
-+
-+20141115
-+ + improve description of limits for color values and color pairs in
-+ curs_color.3x (prompted by patch by Tim van der Molen).
-+ + add VERSION file, using first field in that to record the ABI version
-+ used for configure --with-libtool --disable-libtool-version
-+ + add configure options for applying the ".map" and ".sym" files to
-+ the ncurses, form, menu and panel libraries.
-+ + add ".map" and ".sym" files to show exported symbols, e.g., for
-+ symbol-versioning.
-+
-+20141101
-+ + improve strict compiler-warnings by adding a cast in TRACE_RETURN
-+ and making a new TRACE_RETURN1 macro for cases where the cast does
-+ not apply.
-+
-+20141025
-+ + in-progress changes to integrate the win32 console driver with the
-+ msys2 configuration.
-+
-+20141018
-+ + reviewed terminology 0.6.1, add function key definitions. None of
-+ the vt100-compatibility issues were improved -TD
-+ + improve infocmp conversion of extended capabilities to termcap by
-+ correcting the limit check against parametrized[], as well as filling
-+ in a check if the string happens to have parameters, e.g., "xm"
-+ in recent changes.
-+ + add check for zero/negative dimensions for resizeterm and resize_term
-+ (report by Mike Gran).
-+
-+20141011
-+ + add experimental support for xterm's 1005 mouse mode, to use in a
-+ demonstration of its limitations.
-+ + add experimental support for "%u" format to terminfo.
-+ + modify test/ncurses.c to also show position reports in 'a' test.
-+ + minor formatting fixes to _nc_trace_mmask_t, make this function
-+ exported to help with debugging mouse changes.
-+ + improve behavior of wheel-mice for xterm protocol, noting that there
-+ are only button-presses for buttons "4" and "5", so there is no need
-+ to wait to combine events into double-clicks (report/analysis by
-+ Greg Field).
-+ + provide examples xterm-1005 and xterm-1006 terminfo entries -TD
-+ + implement decoder for xterm SGR 1006 mouse mode.
-+
-+20140927
-+ + implement curs_set in win_driver.c
-+ + implement flash in win_driver.c
-+ + fix an infinite loop in win_driver.c if the command-window loses
-+ focus.
-+ + improve the non-buffered mode, i.e., NCURSES_CONSOLE2, of
-+ win_driver.c by temporarily changing the buffer-size to match the
-+ window-size to eliminate the scrollback. Also enforce a minimum
-+ screen-size of 24x80 in the non-buffered mode.
-+ + modify generated misc/Makefile to suppress install.data from the
-+ dependencies if the --disable-db-install option is used, compensating
-+ for the top-level makefile changes used to add ncurses*-config in the
-+ 20140920 changes (report by Steven Honeyman).
-+
-+20140920
-+ + add ncurses*-config to bin-directory of sample package-scripts.
-+ + add check to ensure that getopt is available; this is a problem in
-+ some older cross-compiler environments.
-+ + expanded on the description of --disable-overwrite in INSTALL
-+ (prompted by reports by Joakim Tjernlund, Thomas Klausner).
-+ See Gentoo #522586 and NetBSD #49200 for examples.
-+ which relates to the clarified guidelines.
-+ + remove special logic from CF_INCLUDE_DIRS which adds the directory
-+ for the --includedir from the build (report by Joakim Tjernlund).
-+ + add case for Unixware to CF_XOPEN_SOURCE, from lynx changes.
-+ + update config.sub from
-+ http://git.savannah.gnu.org/cgit/config.git
-+
-+20140913
-+ + add a configure check to ignore some of the plethora of non-working
-+ C++ cross-compilers.
-+ + build-fixes for Ada95 with gnat 4.9
-+
-+20140906
-+ + build-fix and other improvements for port of ncurses-examples to
-+ NetBSD.
-+ + minor compiler-warning fixes.
-+
-+20140831
-+ + modify test/demo_termcap.c and test/demo_terminfo.c to make their
-+ options more directly comparable, and add "-i" option to specify
-+ a terminal description filename to parse for names to lookup.
-+
-+20140823
-+ + fix special case where double-width character overwrites a single-
-+ width character in the first column (report by Egmont Koblinger,
-+ cf: 20050813).
-+
-+20140816
-+ + fix colors in ncurses 'b' test which did not work after changing
-+ it to put the test-strings in subwindows (cf: 20140705).
-+ + merge redundant SEE-ALSO sections in form and menu manpages.
-+
-+20140809
-+ + modify declarations for user-data pointers in C++ binding to use
-+ reinterpret_cast to facilitate converting typed pointers to void*
-+ in user's application (patch by Adam Jiang).
-+ + regenerated html manpages.
-+ + add note regarding cause and effect for TERM in ncurses manpage,
-+ having noted clueless verbiage in Terminal.app's "help" file
-+ which reverses cause/effect.
-+ + remove special fallback definition for NCURSES_ATTR_T, since macros
-+ have resolved type-mismatches using casts (cf: 970412).
-+ + fixes for win_driver.c:
-+ + handle repainting on endwin/refresh combination.
-+ + implement beep().
-+ + minor cleanup.
-+
-+20140802
-+ + minor portability fixes for MinGW:
-+ + ensure WINVER is defined in makefiles rather than using headers
-+ + add check for gnatprep "-T" option
-+ + work around bug introduced by gcc 4.8.1 in MinGW which breaks
-+ "trace" feature:
-+ http://stackoverflow.com/questions/20877689/gcc-4-8-1-minggw-d-option-does-not-work-as-usual
-+ + fix most compiler warnings for Cygwin ncurses-examples.
-+ + restore "redundant" -I options in test/Makefile.in, since they are
-+ typically needed when building the derived ncurses-examples package
-+ (cf: 20140726).
-+
-+20140726
-+ + eliminate some redundant -I options used for building libraries, and
-+ ensure that ${srcdir} is added to the include-options (prompted by
-+ discussion with Paul Gilmartin).
-+ + modify configure script to work with Minix3.2
-+ + add form library extension O_DYNAMIC_JUSTIFY option which can be
-+ used to override the different treatment of justification for static
-+ versus dynamic fields (adapted from patch by Leon Winter).
-+ + add a null pointer check in test/edit_field.c (report/analysis by
-+ Leon Winter, cf: 20130608).
-+
-+20140719
-+ + make workarounds for compiling test-programs with NetBSD curses.
-+ + improve configure macro CF_ADD_LIBS, to eliminate repeated -l/-L
-+ options, from xterm changes.
-+
-+20140712
-+ + correct Charable() macro check for A_ALTCHARSET in wide-characters.
-+ + build-fix for position-debug code in tty_update.c, to work with or
-+ without sp-funcs.
-+
-+20140705
-+ + add w/W toggle to ncurses.c 'B' test, to demonstrate permutation of
-+ video-attributes and colors with double-width character strings.
-+
-+20140629
-+ + correct check in win_driver.c for saving screen contents, e.g., when
-+ NCURSES_CONSOLE2 is set (cf: 20140503).
-+ + reorganize b/B menu items in ncurses.c, putting the test-strings into
-+ subwindows. This is needed for a planned change to use Unicode
-+ fullwidth characters in the test-screens.
-+ + correct update to form status for _NEWTOP, broken by fixes for
-+ compiler warnings (patch by Leon Winter, cf: 20120616).
-+
-+20140621
-+ + change shared-library suffix for AIX 5 and 6 to ".so", avoiding
-+ conflict with the static library (report by Ben Lentz).
-+ + document RPATH_LIST in INSTALLATION file, as part of workarounds for
-+ upgrading an ncurses library using the "--with-shared" option.
-+ + modify test/ncurses.c c/C tests to cycle through subsets of the
-+ total number of colors, to better illustrate 8/16/88/256-colors by
-+ providing directly comparable screens.
-+ + add test/dots_curses.c, for comparison with the low-level examples.
-+
-+20140614
-+ + fix dereference before null check found by Coverity in tic.c
-+ (cf: 20140524).
-+ + fix sign-extension bug in read_entry.c which prevented "toe" from
-+ reading empty "screen+italics" entry.
-+ + modify sgr for screen.xterm-new to support dim capability -TD
-+ + add dim capability to nsterm+7 -TD
-+ + cancel dim capability for iterm -TD
-+ + add dim, invis capabilities to vte-2012 -TD
-+ + add sitm/ritm to konsole-base and mlterm3 -TD
-+
-+20140609
-+ > fix regression in screen terminfo entries (reports by Christian
-+ Ebert, Gabriele Balducci) -TD
-+ + revert the change to screen; see notes for why this did not work -TD
-+ + cancel sitm/ritm for entries which extend "screen", to work around
-+ screen's hardcoded behavior for SGR 3 -TD
-+
-+20140607
-+ + separate masking for sgr in vidputs from sitm/ritm, which do not
-+ overlap with sgr functionality.
-+ + remove unneeded -i option from adacurses-config; put -a in the -I
-+ option for consistency (patch by Pascal Pignard).
-+ + update xterm-new to patch #305 -TD
-+ + change format of test-scripts for Debian Ada95 and ncurses-examples
-+ packages to quilted to work around Debian #700177 (cf: 20130907).
-+ + build fix for form_driver_w.c as part of ncurses-examples package for
-+ older ncurses than 20131207.
-+ + add Hello World example to adacurses-config manpage.
-+ + remove unused --enable-pc-files option from Ada95/configure.
-+ + add --disable-gnat-projects option for testing.
-+ + revert changes to Ada95 project-files configuration (cf: 20140524).
-+ + corrected usage message in adacurses-config.
-+
-+20140524
-+ + fix typo in ncurses manpage for the NCURSES_NO_MAGIC_COOKIE
-+ environment variable.
-+ + improve discussion of input-echoing in curs_getch.3x
-+ + clarify discussion in curs_addch.3x of wrapping.
-+ + modify parametrized.h to make fln non-padded.
-+ + correct several entries which had termcap-style padding used in
-+ terminfo: adm21, aj510, alto-h19, att605-pc, x820 -TD
-+ + correct syntax for padding in some entries: dg211, h19 -TD
-+ + correct ti924-8 which had confused padding versus octal escapes -TD
-+ + correct padding in sbi entry -TD
-+ + fix an old bug in the termcap emulation; "%i" was ignored in tparm()
-+ because the parameters to be incremented were already on the internal
-+ stack (report by Corinna Vinschen).
-+ + modify tic's "-c" option to take into account the "-C" option to
-+ activate additional checks which compare the results from running
-+ tparm() on the terminfo expressions versus the translated termcap
-+ expressions.
-+ + modify tic to allow it to read from FIFOs (report by Matthieu Fronton,
-+ cf: 20120324).
-+ > patches by Nicolas Boulenguez:
-+ + explicit dereferences to suppress some style warnings.
-+ + when c_varargs_to_ada.c includes its header, use double quotes
-+ instead of <>.
-+ + samples/ncurses2-util.adb: removed unused with clause. The warning
-+ was removed by an obsolete pragma.
-+ + replaced Unreferenced pragmas with Warnings (Off). The latter,
-+ available with older GNATs, needs no configure test. This also
-+ replaces 3 untested Unreferenced pragmas.
-+ + simplified To_C usage in trace handling. Using two parameters allows
-+ some basic formatting, and avoids a warning about security with some
-+ compiler flags.
-+ + for generated Ada sources, replace many snippets with one pure
-+ package.
-+ + removed C_Chtype and its conversions.
-+ + removed C_AttrType and its conversions.
-+ + removed conversions between int, Item_Option_Set, Menu_Option_Set.
-+ + removed int, Field_Option_Set, Item_Option_Set conversions.
-+ + removed C_TraceType, Attribute_Option_Set conversions.
-+ + replaced C.int with direct use of Eti_Error, now enumerated. As it
-+ was used in a case statement, values were tested by the Ada compiler
-+ to be consecutive anyway.
-+ + src/Makefile.in: remove duplicate stanza
-+ + only consider using a project for shared libraries.
-+ + style. Silent gnat-4.9 warning about misplaced "then".
-+ + generate shared library project to honor ADAFLAGS, LDFLAGS.
-+
-+20140510
-+ + cleanup recently introduced compiler warnings for MingW port.
-+ + workaround for ${MAKEFLAGS} configure check versus GNU make 4.0,
-+ which introduces more than one gratuitous incompatibility.
-+
-+20140503
-+ + add vt520ansi terminfo entry (patch by Mike Gran)
-+ + further improve MinGW support for the scenario where there is an
-+ ANSI-escapes handler such as ansicon running in the console window
-+ (patch by Juergen Pfeifer).
-+
-+20140426
-+ + add --disable-lib-suffixes option (adapted from patch by Juergen
-+ Pfeifer).
-+ + merge some changes from Juergen Pfeifer's work with MSYS2, to
-+ simplify later merging:
-+ + use NC_ISATTY() macro for isatty() in library
-+ + add _nc_mingw_isatty() and related functions to windows-driver
-+ + rename terminal driver entrypoints to simplify grep's
-+ + remove a check in the sp-funcs flavor of newterm() which allowed only
-+ the first call to newterm() to succeed (report by Thomas Beierlein,
-+ cf: 20090927).
-+
-+20140419
-+ + update config.guess, config.sub from
-+ http://git.savannah.gnu.org/cgit/config.git
-+
-+20140412
-+ + modify configure script:
-+ + drop the -no-gcc option from Intel compiler, from lynx changes.
-+ + extend the --with-hashed-db configure option to simplify building
-+ with different versions of Berkeley database using FreeBSD ports.
-+ + improve initialization for MinGW port (Juergen Pfeifer):
-+ + enforce Windows-style path-separator if cross-compiling,
-+ + add a driver-name method to each of the drivers,
-+ + allow the Windows driver name to match "unknown", ignoring case,
-+ + lengthen the built-in name for the Windows console driver to
-+ "#win32console", and
-+ + move the comparison of driver-names allowing abbreviation, e.g.,
-+ to "#win32con" into the Windows console driver.
-+
-+20140329
-+ + add check in tic for mismatch between ccc and initp/initc
-+ + cancel ccc in putty-256color and konsole-256color for consistency
-+ with the cancelled initc capability (patch by Sven Zuhlsdorf).
-+ + add xterm+256setaf building block for various terminals which only
-+ get the 256-color feature half-implemented -TD
-+ + updated "st" entry (leaving the 0.1.1 version as "simpleterm") to
-+ 0.4.1 -TD
-+
-+20140323
-+ + fix typo in "mlterm" entry (report by Gabriele Balducci) -TD
-+
-+20140322
-+ + use types from in sample build-scripts for chtype, etc.
-+ + modify configure script and curses.h.in to allow the types specified
-+ using --with-chtype and related options to be defined in
-+ + add terminology entry -TD
-+ + add mlterm3 entry, use that as "mlterm" -TD
-+ + inherit mlterm-256color from mlterm -TD
-+
-+20140315
-+ + modify _nc_New_TopRow_and_CurrentItem() to ensure that the menu's
-+ top-row is adjusted as needed to ensure that the current item is
-+ on the screen (patch by Johann Klammer).
-+ + add wgetdelay() to retrieve _delay member of WINDOW if it happens to
-+ be opaque, e.g., in the pthread configuration (prompted by patch by
-+ Soren Brinkmann).
-+
-+20140308
-+ + modify ifdef in read_entry.c to handle the case where
-+ NCURSES_USE_DATABASE is not defined (patch by Xin Li).
-+ + add cast in form_driver_w() to fix ARM build (patch by Xin Li).
-+ + add logic to win_driver.c to save/restore screen contents when not
-+ allocating a console-buffer (cf: 20140215).
-+
-+20140301
-+ + clarify error-returns from newwin (report by Ruslan Nabioullin).
-+
-+20140222
-+ + fix some compiler warnings in win_driver.c
-+ + updated notes for wsvt25 based on tack and vttest -TD
-+ + add teken entry to show actual properties of FreeBSD's "xterm"
-+ console -TD
-+
-+20140215
-+ + in-progress changes to win_driver.c to implement output without
-+ allocating a console-buffer. This uses a pre-existing environment
-+ variable NCGDB used by Juergen Pfeifer for debugging (prompted by
-+ discussion with Erwin Waterlander regarding Console2, which hangs
-+ when reading in an allocated console-buffer).
-+ + add -t option to gdc.c, and modify to accept "S" to step through the
-+ scrolling-stages.
-+ + regenerate NCURSES-Programming-HOWTO.html to fix some of the broken
-+ html emitted by docbook.
-+
-+20140209
-+ + modify CF_XOPEN_SOURCE macro to omit followup check to determine if
-+ _XOPEN_SOURCE can/should be defined. g++ 4.7.2 built on Solaris 10
-+ has some header breakage due to its own predefinition of this symbol
-+ (report by Jean-Pierre Flori, Sage #15796).
-+
-+20140201
-+ + add/use symbol NCURSES_PAIRS_T like NCURSES_COLOR_T, to illustrate
-+ which "short" types are for color pairs and which are color values.
-+ + fix build for s390x, by correcting field bit offsets in generated
-+ representation clauses when int=32 long=64 and endian=big, or at
-+ least on s390x (patch by Nicolas Boulenguez).
-+ + minor cleanup change to test/form_driver_w.c (patch by Gaute Hope).
-+
-+20140125
-+ + remove unnecessary ifdef's in Ada95/gen/gen.c, which reportedly do
-+ not work as is with gcc 4.8 due to fixes using chtype cast made for
-+ new compiler warnings by gcc 4.8 in 20130824 (Debian #735753, patch
-+ by Nicolas Boulenguez).
-+
-+20140118
-+ + apply includesubdir variable which was introduced in 20130805 to
-+ gen-pkgconfig.in (Debian #735782).
-+
-+20131221
-+ + further improved man2html, used this to fix broken links in html
-+ manpages. See
-+ ftp://invisible-island.net/ncurses/patches/man2html
-+
-+20131214
-+ + modify configure-script/ifdef's to allow OLD_TTY feature to be
-+ suppressed if the type of ospeed is configured using the option
-+ --with-ospeed to not be a short. By default, it is a short for
-+ termcap-compatibility (adapted from suggestion by Christian
-+ Weisgerber).
-+ + correct a typo in _nc_baudrate() (patch by Christian Weisgerber,
-+ cf: 20061230).
-+ + fix a few -Wlogical-op warnings.
-+ + updated llib-l* files.
-+
-+20131207
-+ + add form_driver_w() entrypoint to wide-character forms library, as
-+ well as test program form_driver_w (adapted from patch by Gaute
-+ Hope).
-+
-+20131123
-+ + minor fix for CF_GCC_WARNINGS to special-case options which are not
-+ recognized by clang.
-+
-+20131116
-+ + add special case to configure script to move _XOPEN_SOURCE_EXTENDED
-+ definition from CPPFLAGS to CFLAGS if it happens to be needed for
-+ Solaris, because g++ errors with that definition (report by
-+ Jean-Pierre Flori, Sage #15268).
-+ + correct logic in infocmp's -i option which was intended to ignore
-+ strings which correspond to function-keys as candidates for piecing
-+ together initialization- or reset-strings. The problem dates to
-+ 1.9.7a, but was overlooked until changes in -Wlogical-op warnings for
-+ gcc 4.8 (report by David Binderman).
-+ + updated CF_GCC_WARNINGS to documented options for gcc 4.9.0, adding
-+ checks for -Wextra, -Wignored-qualifiers and -Wlogical-op
-+ + updated CF_GCC_WARNINGS to documented options for gcc 4.9.0, moving
-+ checks for -Wextra and -Wdeclaration-after-statement into the macro,
-+ and adding checks for -Wignored-qualifiers, -Wlogical-op and
-+ -Wvarargs
-+ + updated CF_CURSES_UNCTRL_H and CF_SHARED_OPTS macros from ongoing
-+ work on cdk.
-+ + update config.sub from
-+ http://git.savannah.gnu.org/cgit/config.git
-+
-+20131110
-+ + minor cleanup of terminfo.tail
-+
-+20131102
-+ + use TS extension to describe xterm's title-escapes -TD
-+ + modify terminator and nsterm-s to use xterm+sl-twm building block -TD
-+ + update hurd.ti, add xenl to reflect 2011-03-06 change in
-+ http://git.savannah.gnu.org/cgit/hurd/hurd.git/log/console/display.c
-+ (Debian #727119).
-+ + simplify pfkey expression in ansi.sys -TD
-+
-+20131027
-+ + correct/simplify ifdef's for cur_term versus broken-linker and
-+ reentrant options (report by Jean-Pierre Flori, cf: 20090530).
-+ + modify release/version combinations in test build-scripts to make
-+ them more consistent with other packages.
-+
-+20131019
-+ + add nc_mingw.h to installed headers for MinGW port; needed for
-+ compiling ncurses-examples.
-+ + add rpm-script for testing cross-compile of ncurses-examples.
-+
-+20131014
-+ + fix new typo in CF_ADA_INCLUDE_DIRS macro (report by Roumen Petrov).
-+
-+20131012
-+ + fix a few compiler warnings in progs and test.
-+ + minor fix to package/debian-mingw/rules, do not strip dll's.
-+ + minor fixes to configure script for empty $prefix, e.g., when doing
-+ cross-compiles to MinGW.
-+ + add script for building test-packages of binaries cross-compiled to
-+ MinGW using NSIS.
-+
-+20131005
-+ + minor fixes for ncurses-example package and makefile.
-+ + add scripts for test-builds of cross-compiler packages for ncurses6
-+ to MinGW.
-+
-+20130928
-+ + some build-fixes for ncurses-examples with NetBSD-6.0 curses, though
-+ it lacks some common functions such as use_env() which is not yet
-+ addressed.
-+ + build-fix and some compiler warning fixes for ncurses-examples with
-+ OpenBSD 5.3
-+ + fix a possible null-pointer reference in a trace message from newterm.
-+ + quiet a few warnings from NetBSD 6.0 namespace pollution by
-+ nonstandard popcount() function in standard strings.h header.
-+ + ignore g++ 4.2.1 warnings for "-Weffc++" in c++/cursesmain.cc
-+ + fix a few overlooked places for --enable-string-hacks option.
-+
-+20130921
-+ + fix typo in curs_attr.3x (patch by Sven Joachim, cf: 20130831).
-+ + build-fix for --with-shared option for DragonFly and FreeBSD (report
-+ by Rong-En Fan, cf: 20130727).
-+
-+20130907
-+ + build-fixes for MSYS for two test-programs (patches by Ray Donnelly,
-+ Alexey Pavlov).
-+ + revert change to two of the dpkg format files, to work with dpkg
-+ before/after Debian #700177.
-+ + fix gcc -Wconversion warning in wattr_get() macro.
-+ + add msys and msysdll to known host/configuration types (patch by
-+ Alexey Pavlov).
-+ + modify CF_RPATH_HACK configure macro to not rely upon "-u" option
-+ of sort, improving portability.
-+ + minor improvements for test-programs from reviewing Solaris port.
-+ + update config.guess, config.sub from
-+ http://git.savannah.gnu.org/cgit/config.git
-+
-+20130831
-+ + modify test/ncurses.c b/B tests to display lines only for the
-+ attributes which a given terminal supports, to make room for an
-+ italics test.
-+ + completed ncv table in terminfo.tail; it did not list the wide
-+ character codes listed in X/Open Curses issue 7.
-+ + add A_ITALIC extension (prompted by discussion with Egmont Koblinger).
-+
-+20130824
-+ + fix some gcc 4.8 -Wconversion warnings.
-+ + change format of dpkg test-scripts to quilted to work around bug
-+ introduced by Debian #700177.
-+ + discard cached keyname() values if meta() is changed after a value
-+ was cached using (report by Kurban Mallachiev).
-+
-+20130816
-+ + add checks in tic to warn about terminals which lack cursor
-+ addressing, capabilities or having those, are marked as hard_copy or
-+ generic_type.
-+ + use --without-progs in mingw-ncurses rpm.
-+ + split out _nc_init_termtype() from alloc_entry.c to use in MinGW
-+ port when tic and other programs are not needed.
-+
-+20130805
-+ + minor fixes to the --disable-overwrite logic, to ensure that the
-+ configured $(includedir) is not cancelled by the mingwxx-filesystem
-+ rpm macros.
-+ + add --disable-db-install configure option, to simplify building
-+ cross-compile support packages.
-+ + add mingw-ncurses.spec file, for testing cross-compiles.
-+
-+20130727
-+ + improve configure macros from ongoing work on cdk, dialog, xterm:
-+ + CF_ADD_LIB_AFTER - fix a problem with -Wl options
-+ + CF_RPATH_HACK - add missing result-message
-+ + CF_SHARED_OPTS - modify to use $rel_builddir in cygwin and mingw
-+ dll symbols (which can be overridden) rather than explicit "../".
-+ + CF_SHARED_OPTS - modify NetBSD and DragonFly symbols to use ${CC}
-+ rather than ${LD} to improve rpath support.
-+ + CF_SHARED_OPTS - add a symbol to denote the temporary files that
-+ are created by the macro, to simplify clean-rules.
-+ + CF_X_ATHENA - trim extra libraries to work with -Wl,--as-needed
-+ + fix a regression in hashed-database support for NetBSD, which uses
-+ the key-size differently from other implementations (cf: 20121229).
-+
-+20130720
-+ + further improvements for setupterm manpage, clarifying the
-+ initialization of cur_term.
-+
-+20130713
-+ + improve manpages for initscr and setupterm.
-+ + minor compiler-warning fixes
-+
-+20130706
-+ + add fallback defs for and (cf: 20120225).
-+ + add check for size of wchar_t, use that to suppress a chunk of
-+ wcwidth.h in MinGW port.
-+ + quiet linker warnings for MinGW cross-compile with dll's using the
-+ --enable-auto-import flag.
-+ + add ncurses.map rule to ncurses/Makefile to help diagnose symbol
-+ table issues.
-+
-+20130622
-+ + modify the clear program to take into account the E3 extended
-+ capability to clear the terminal's scrollback buffer (patch by
-+ Miroslav Lichvar, Redhat #815790).
-+ + clarify in resizeterm manpage that LINES and COLS are updated.
-+ + updated ansi example in terminfo.tail, correct misordered example
-+ of sgr.
-+ + fix other doclifter warnings for manpages
-+ + remove unnecessary ".ta" in terminfo.tail, add missing ".fi"
-+ (patch by Eric Raymond).
-+
-+20130615
-+ + minor changes to some configure macros to make them more reusable.
-+ + fixes for tabs program (prompted by report by Nick Andrik).
-+ + corrected logic in command-line parsing of -a and -c predefined
-+ tab-lists options.
-+ + allow "-0" and "-8" options to be combined with others, e.g.,"-0d".
-+ + make warning messages more consistent with the other utilities by
-+ not printing the full pathname of the program.
-+ + add -V option for consistency with other utilities.
-+ + fix off-by-one in columns for tabs program when processing an option
-+ such as "-5" (patch by Nick Andrik).
-+
-+20130608
-+ + add to test/demo_forms.c examples of using the menu-hooks as well
-+ as showing how the menu item user-data can be used to pass a callback
-+ function pointer.
-+ + add test/dots_termcap.c
-+ + remove setupterm call from test/demo_termcap.c
-+ + build-fix if --disable-ext-funcs configure option is used.
-+ + modified test/edit_field.c and test/demo_forms.c to move the lengths
-+ into a user-data structure, keeping the original string for later
-+ expansion to free-format input/out demo.
-+ + modified test/demo_forms.c to load data from file.
-+ + added note to clarify Terminal.app's non-emulation of the various
-+ terminal types listed in the preferences dialog -TD
-+ + fix regression in error-reporting in lib_setup.c (Debian #711134,
-+ cf: 20121117).
-+ + build-fix for a case where --enable-broken_linker and
-+ --enable-reentrant options are combined (report by George R Goffe).
-+
-+20130525
-+ + modify mvcur() to distinguish between internal use by the ncurses
-+ library, and external callers, preventing it from reading the content
-+ of the screen which is only nonblank when curses calls have updated
-+ it. This makes test/dots_mvcur.c avoid painting colored cells in
-+ the left margin of the display.
-+ + minor fix to test/dots_mvcur.c
-+ + move configured symbols USE_DATABASE and USE_TERMCAP to term.h as
-+ NCURSES_USE_DATABASE and NCURSES_USE_TERMCAP to allow consistent
-+ use of these symbols in term_entry.h
-+
-+20130518
-+ + corrected ifdefs in test/testcurs.c to allow comparison of mouse
-+ interface versus pdcurses (cf: 20130316).
-+ + add pow() to configure-check for math library, needed since
-+ 20121208 for test/hanoi (Debian #708056).
-+ + regenerated html manpages.
-+ + update doctype used for html documentation.
-+
-+20130511
-+ + move nsterm-related entries out of "obsolete" section to more
-+ plausible "ansi consoles" -TD
-+ + additional cleanup of table-of-contents by reordering -TD
-+ + revise fix for check for 8-bit value in _nc_insert_ch(); prior fix
-+ prevented inserts when video attributes were attached to the data
-+ (cf: 20121215) (Redhat #959534).
-+
-+20130504
-+ + fixes for issues found by Coverity:
-+ + correct FNKEY() macro in progs/dump_entry.c, allowing kf11-kf63 to
-+ display when infocmp's -R option is used for HP or AIX subsets.
-+ + fix dead-code issue with test/movewindow.c
-+ + improve limited-checking in _nc_read_termtype().
-+
-+20130427
-+ + fix clang 3.2 warning in progs/dump_entry.c
-+ + drop AC_TYPE_SIGNAL check; ncurses relies on c89 and later.
-+
-+20130413
-+ + add MinGW to cases where ncurses installs by default into /usr
-+ (prompted by discussion with Daniel Silva Ferreira).
-+ + add -D option to infocmp's usage-message (patch by Miroslav Lichvar).
-+ + add a missing 'int' type for main function in configure check for
-+ type of bool variable, to work with clang 3.2 (report by Dmitri
-+ Gribenko).
-+ + improve configure check for static_cast, to work with clang 3.2
-+ (report by Dmitri Gribenko).
-+ + re-order rule for demo.o and macros defining header dependencies in
-+ c++/Makefile.in to accommodate gmake (report by Dmitri Gribenko).
-+
-+20130406
-+ + improve parameter checking in copywin().
-+ + modify configure script to work around OS X's "libtool" program, to
-+ choose glibtool instead. At the same time, chance the autoconf macro
-+ to look for a "tool" rather than a "prog", to help with potential use
-+ in cross-compiling.
-+ + separate the rpath usage for c++ library from demo program
-+ (Redhat #911540)
-+ + update/correct header-dependencies in c++ makefile (report by Werner
-+ Fink).
-+ + add --with-cxx-shared to dpkg-script, as done for rpm-script.
-+
-+20130324
-+ + build-fix for libtool configuration (reports by Daniel Silva Ferreira
-+ and Roumen Petrov).
-+
-+20130323
-+ + build-fix for OS X, to handle changes for --with-cxx-shared feature
-+ (report by Christian Ebert).
-+ + change initialization for vt220, similar entries for consistency
-+ with cursor-key strings (NetBSD #47674) -TD
-+ + further improvements to linux-16color (Benjamin Sittler)
-+
-+20130316
-+ + additional fix for tic.c, to allocate missing buffer space.
-+ + eliminate configure-script warnings for gen-pkgconfig.in
-+ + correct typo in sgr string for sun-color,
-+ add bold for consistency with sgr,
-+ change smso for consistency with sgr -TD
-+ + correct typo in sgr string for terminator -TD
-+ + add blink to the attributes masked by ncv in linux-16color (report
-+ by Benjamin Sittler)
-+ + improve warning message from post-load checking for missing "%?"
-+ operator by tic/infocmp by showing the entry name and capability.
-+ + minor formatting improvement to tic/infocmp -f option to ensure
-+ line split after "%;".
-+ + amend scripting for --with-cxx-shared option to handle the debug
-+ library "libncurses++_g.a" (report by Sven Joachim).
-+
-+20130309
-+ + amend change to toe.c for reading from /dev/zero, to ensure that
-+ there is a buffer for the temporary filename (cf: 20120324).
-+ + regenerated html manpages.
-+ + fix typo in terminfo.head (report by Sven Joachim, cf: 20130302).
-+ + updated some autoconf macros:
-+ + CF_ACVERSION_CHECK, from byacc 1.9 20130304
-+ + CF_INTEL_COMPILER, CF_XOPEN_SOURCE from luit 2.0-20130217
-+ + add configure option --with-cxx-shared to permit building
-+ libncurses++ as a shared library when using g++, e.g., the same
-+ limitations as libtool but better integrated with the usual build
-+ configuration (Redhat #911540).
-+ + modify MKkey_defs.sh to filter out build-path which was unnecessarily
-+ shown in curses.h (Debian #689131).
-+
-+20130302
-+ + add section to terminfo manpage discussing user-defined capabilities.
-+ + update manpage description of NCURSES_NO_SETBUF, explaining why it
-+ is obsolete.
-+ + add a check in waddch_nosync() to ensure that tab characters are
-+ treated as control characters; some broken locales claim they are
-+ printable.
-+ + add some traces to the Windows console driver.
-+ + initialize a temporary array in _nc_mbtowc, needed for some cases
-+ of raw input in MinGW port.
-+
-+20130218
-+ + correct ifdef on change to lib_twait.c (report by Werner Fink).
-+ + update config.guess, config.sub
-+
-+20130216
-+ + modify test/testcurs.c to work with mouse for ncurses as it does for
-+ pdcurses.
-+ + modify test/knight.c to work with mouse for pdcurses as it does for
-+ ncurses.
-+ + modify internal recursion in wgetch() which handles cooked mode to
-+ check if the call to wgetnstr() returned an error. This can happen
-+ when both nocbreak() and nodelay() are set, for instance (report by
-+ Nils Christopher Brause) (cf: 960418).
-+ + fixes for issues found by Coverity:
-+ + add a check for valid position in ClearToEOS()
-+ + fix in lib_twait.c when --enable-wgetch-events is used, pointer
-+ use after free.
-+ + improve a limit-check in make_hash.c
-+ + fix a memory leak in hashed_db.c
-+
-+20130209
-+ + modify test/configure script to make it simpler to override names
-+ of curses-related libraries, to help with linking with pdcurses in
-+ MinGW environment.
-+ + if the --with-terminfo-dirs configure option is not used, there is
-+ no corresponding compiled-in value for that. Fill in "no default
-+ value" for that part of the manpage substitution.
-+
-+20130202
-+ + correct initialization in knight.c which let it occasionally make
-+ an incorrect move (cf: 20001028).
-+ + improve documentation of the terminfo/termcap search path.
-+
-+20130126
-+ + further fixes to mvcur to pass callback function (cf: 20130112),
-+ needed to make test/dots_mvcur work.
-+ + reduce calls to SetConsoleActiveScreenBuffer in win_driver.c, to
-+ help reduce flicker.
-+ + modify configure script to omit "+b" from linker options for very
-+ old HP-UX systems (report by Dennis Grevenstein)
-+ + add HP-UX workaround for missing EILSEQ on old HP-UX systems (patch
-+ by Dennis Grevenstein).
-+ + restore memmove/strdup support for antique systems (request by
-+ Dennis Grevenstein).
-+ + change %l behavior in tparm to push the string length onto the stack
-+ rather than saving the formatted length into the output buffer
-+ (report by Roy Marples, cf: 980620).
-+
-+20130119
-+ + fixes for issues found by Coverity:
-+ + fix memory leak in safe_sprintf.c
-+ + add check for return-value in tty_update.c
-+ + correct initialization for -s option in test/view.c
-+ + add check for numeric overflow in lib_instr.c
-+ + improve error-checking in copywin
-+ + add advice in infocmp manpage for termcap users (Debian #698469).
-+ + add "-y" option to test/demo_termcap and test/demo_terminfo to
-+ demonstrate behavior with/without extended capabilities.
-+ + updated termcap manpage to document legacy termcap behavior for
-+ matching capability names.
-+ + modify name-comparison for tgetstr, etc., to accommodate legacy
-+ applications as well as to improve compatbility with BSD 4.2
-+ termcap implementations (Debian #698299) (cf: 980725).
-+
-+20130112
-+ + correct prototype in manpage for vid_puts.
-+ + drop ncurses/tty/tty_display.h, ncurses/tty/tty_input.h, since they
-+ are unused in the current driver model.
-+ + modify mvcur to use stdout except when called within the ncurses
-+ library.
-+ + modify vidattr and vid_attr to use stdout as documented in manpage.
-+ + amend changes made to buffering in 20120825 so that the low-level
-+ putp() call uses stdout rather than ncurses' internal buffering.
-+ The putp_sp() call does the same, for consistency (Redhat #892674).
-+
-+20130105
-+ + add "-s" option to test/view.c to allow it to start in single-step
-+ mode, reducing size of trace files when it is used for debugging
-+ MinGW changes.
-+ + revert part of 20121222 change to tinfo_driver.c
-+ + add experimental logic in win_driver.c to improve optimization of
-+ screen updates. This does not yet work with double-width characters,
-+ so it is ifdef'd out for the moment (prompted by report by Erwin
-+ Waterlander regarding screen flicker).
-+
-+20121229
-+ + fix coverity warnings regarding copying into fixed-size buffers.
-+ + add throw-declarations in the c++ binding per Coverity warning.
-+ + minor changes to new-items for consistent reference to bug-report
-+ numbers.
-+
-+20121222
-+ + add *.dSYM directories to clean-rule in ncurses directory makefile,
-+ for Mac OS builds.
-+ + add a configure check for gcc option -no-cpp-precomp, which is not
-+ available in all Mac OS X configurations (report by Andras Salamon,
-+ cf: 20011208).
-+ + improve 20021221 workaround for broken acs, handling a case where
-+ that ACS_xxx character is not in the acsc string but there is a known
-+ wide-character which can be used.
-+
-+20121215
-+ + fix several warnings from clang 3.1 --analyze, includes correcting
-+ a null-pointer check in _nc_mvcur_resume.
-+ + correct display of double-width characters with MinGW port (report
-+ by Erwin Waterlander).
-+ + replace MinGW's wcrtomb(), fixing a problem with _nc_viscbuf
-+ > fixes based on Coverity report:
-+ + correct coloring in test/bs.c
-+ + correct check for 8-bit value in _nc_insert_ch().
-+ + remove dead code in progs/tset.c, test/linedata.h
-+ + add null-pointer checks in lib_tracemse.c, panel.priv.h, and some
-+ test-programs.
-+
-+20121208
-+ + modify test/knight.c to show the number of choices possible for
-+ each position in automove option, e.g., to allow user to follow
-+ Warnsdorff's rule to solve the puzzle.
-+ + modify test/hanoi.c to show the minimum number of moves possible for
-+ the given number of tiles (prompted by patch by Lucas Gioia).
-+ > fixes based on Coverity report:
-+ + remove a few redundant checks.
-+ + correct logic in test/bs.c, when randomly placing a specific type of
-+ ship.
-+ + check return value from remove/unlink in tic.
-+ + check return value from sscanf in test/ncurses.c
-+ + fix a null dereference in c++/cursesw.cc
-+ + fix two instances of uninitialized variables when configuring for the
-+ terminal driver.
-+ + correct scope of variable used in SetSafeOutcWrapper macro.
-+ + set umask when calling mkstemp in tic.
-+ + initialize wbkgrndset() temporary variable when extended-colors are
-+ used.
-+
-+20121201
-+ + also replace MinGW's wctomb(), fixing a problem with setcchar().
-+ + modify test/view.c to load UTF-8 when built with MinGW by using
-+ regular win32 API because the MinGW functions mblen() and mbtowc()
-+ do not work.
-+
-+20121124
-+ + correct order of color initialization versus display in some of the
-+ test-programs, e.g., test_addstr.c
-+ > fixes based on Coverity report:
-+ + delete windows on exit from some of the test-programs.
-+
-+20121117
-+ > fixes based on Coverity report:
-+ + add missing braces around FreeAndNull in two places.
-+ + various fixes in test/ncurses.c
-+ + improve limit-checks in tinfo/make_hash.c, tinfo/read_entry.c
-+ + correct malloc size in progs/infocmp.c
-+ + guard against negative array indices in test/knight.c
-+ + fix off-by-one limit check in test/color_name.h
-+ + add null-pointer check in progs/tabs.c, test/bs.c, test/demo_forms.c,
-+ test/inchs.c
-+ + fix memory-leak in tinfo/lib_setup.c, progs/toe.c,
-+ test/clip_printw.c, test/demo_menus.c
-+ + delete unused windows in test/chgat.c, test/clip_printw.c,
-+ test/insdelln.c, test/newdemo.c on error-return.
-+
-+20121110
-+ + modify configure macro CF_INCLUDE_DIRS to put $CPPFLAGS after the
-+ local -I include options in case someone has set conflicting -I
-+ options in $CPPFLAGS (prompted by patch for ncurses/Makefile.in by
-+ Vassili Courzakis).
-+ + modify the ncurses*-config scripts to eliminate relative paths from
-+ the RPATH_LIST variable, e.g., "../lib" as used in installing shared
-+ libraries or executables.
-+
-+20121102
-+ + realign these related pages:
-+ curs_add_wchstr.3x
-+ curs_addchstr.3x
-+ curs_addstr.3x
-+ curs_addwstr.3x
-+ and fix a long-ago error in curs_addstr.3x which said that a -1
-+ length parameter would only write as much as fit onto one line
-+ (report by Reuben Thomas).
-+ + remove obsolete fallback _nc_memmove() for memmove()/bcopy().
-+ + remove obsolete fallback _nc_strdup() for strdup().
-+ + cancel any debug-rpm in package/ncurses.spec
-+ + reviewed vte-2012, reverted most of the change since it was incorrect
-+ based on testing with tack -TD
-+ + un-cancel the initc in vte-256color, since this was implemented
-+ starting with version 0.20 in 2009 -TD
-+
-+20121026
-+ + improve malloc/realloc checking (prompted by discussion in Redhat
-+ #866989).
-+ + add ncurses test-program as "ncurses6" to the rpm- and dpkg-scripts.
-+ + updated configure macros CF_GCC_VERSION and CF_WITH_PATHLIST. The
-+ first corrects pattern used for Mac OS X's customization of gcc.
-+
-+20121017
-+ + fix change to _nc_scroll_optimize(), which incorrectly freed memory
-+ (Redhat #866989).
-+
-+20121013
-+ + add vte-2012, gnome-2012, making these the defaults for vte/gnome
-+ (patch by Christian Persch).
-+
-+20121006
-+ + improve CF_GCC_VERSION to work around Debian's customization of gcc
-+ --version message.
-+ + improve configure macros as done in byacc:
-+ + drop 2.13 compatibility; use 2.52.xxxx version only since EMX port
-+ has used that for a while.
-+ + add 3rd parameter to AC_DEFINE's to allow autoheader to run, i.e.,
-+ for experimental use.
-+ + remove unused configure macros.
-+ + modify configure script and makefiles to quiet new autoconf warning
-+ for LIBS_TO_MAKE variable.
-+ + modify configure script to show $PATH_SEPARATOR variable.
-+ + update config.guess, config.sub
-+
-+20120922
-+ + modify setupterm to set its copy of TERM to "unknown" if configured
-+ for the terminal driver and TERM was null or empty.
-+ + modify treatment of TERM variable for MinGW port to allow explicit
-+ use of the windows console driver by checking if $TERM is set to
-+ "#win32con" or an abbreviation of that.
-+ + undo recent change to fallback definition of vsscanf() to build with
-+ older Solaris compilers (cf: 20120728).
-+
-+20120908
-+ + add test-screens to test/ncurses to show 256-characters at a time,
-+ to help with MinGW port.
-+
-+20120903
-+ + simplify varargs logic in lib_printw.c; va_copy is no longer needed
-+ there.
-+ + modifications for MinGW port to make wide-character display usable.
-+
-+20120902
-+ + regenerate configure script (report by Sven Joachim, cf: 20120901).
-+
-+20120901
-+ + add a null-pointer check in _nc_flush (cf: 20120825).
-+ + fix a case in _nc_scroll_optimize() where the _oldnums_list array
-+ might not be allocated.
-+ + improve comparisons in configure.in for unset shell variables.
-+
-+20120826
-+ + increase size of ncurses' output-buffer, in case of very small
-+ initial screen-sizes.
-+ + fix evaluation of TERMINFO and TERMINFO_DIRS default values as needed
-+ after changes to use --datarootdir (reports by Gabriele Balducci,
-+ Roumen Petrov).
-+
-+20120825
-+ + change output buffering scheme, using buffer maintained by ncurses
-+ rather than stdio, to avoid problems with SIGTSTP handling (report
-+ by Brian Bloniarz).
-+
-+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
-+ for 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 +1799,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 +1854,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 +1918,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 +1993,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 +2177,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
-@@ -704,7 +2403,7 @@
- + quiet some pedantic gcc warnings.
- + modify _nc_wgetch() to check for a -1 in the fifo, e.g., after a
- SIGWINCH, and discard that value, to avoid confusing application
-- (patch by Eygene Ryabinkin, FreeBSD bin/136223).
-+ (patch by Eygene Ryabinkin, FreeBSD #136223).
-
- 20091017
- + modify handling of $PKG_CONFIG_LIBDIR to use only the first item in
-@@ -784,7 +2483,7 @@
-
- 20090815
- + correct use of terminfo capabilities for initializing soft-keys,
-- broken in 20090509 merging.
-+ broken in 20090510 merging.
- + modify wgetch() to ensure it checks SIGWINCH when it gets an error
- in non-blocking mode (patch by Clemens Ladisch).
- + use PATH_SEPARATOR symbol when substituting into run_tic.sh, to
-@@ -823,7 +2522,7 @@
-
- 20090718
- + fix a null-pointer check in _nc_format_slks() in lib_slk.c, from
-- 20070704 changes.
-+ 20090704 changes.
- + modify _nc_find_type_entry() to use hashing.
- + make CCHARW_MAX value configurable, noting that changing this would
- change the size of cchar_t, and would be ABI-incompatible.
-@@ -929,7 +2628,7 @@
- intermediate variable LT_UNDEF in the configure script, and then
- using that in the libtool link-commands.
- + fix an missing use of NCURSES_PUBLIC_VAR() in tinfo/MKcodes.awk
-- from 2009031 changes.
-+ from 20090321 changes.
- + improve mk-1st.awk script by writing separate cases for the
- LIBTOOL_LINK command, depending on which library (ncurses, ticlib,
- termlib) is to be linked.
-@@ -1533,8 +3232,8 @@
- that library.
- + add/modify null-pointer checks in several functions for SP and/or
- the WINDOW* parameter (report by Thorben Krueger).
-- + fixes for field_buffer() in formw library (see Redhat Bugzilla
-- #310071, patches by Miroslav Lichvar).
-+ + fixes for field_buffer() in formw library (see Redhat #310071,
-+ patches by Miroslav Lichvar).
- + improve performance of NCURSES_CHAR_EQ code (patch by Miroslav
- Lichvar).
- + update/improve mlterm and rxvt terminfo entries, e.g., for
-@@ -1645,7 +3344,7 @@
- + modify configure script to quiet c++ build with libtool when the
- --disable-echo option is used.
- + modify configure script to disable ada95 if libtool is selected,
-- writing a warning message (addresses FreeBSD ports/114493).
-+ writing a warning message (addresses FreeBSD #114493).
- + update config.guess, config.sub
-
- 20070707
-@@ -2130,8 +3829,7 @@
- + workaround for 20050806 ifdef's change to allow visbuf.c to compile
- when using --with-termlib --with-trace options.
- + improve tgetstr() by making the return value point into the user's
-- buffer, if provided (patch by Miroslav Lichvar (see Redhat Bugzilla
-- #202480)).
-+ buffer, if provided (patch by Miroslav Lichvar (see Redhat #202480)).
- + correct libraries needed for foldkeys (report by Stanislav Ievlev)
-
- 20060826
-@@ -2144,10 +3842,10 @@
- source output (Debian #378783).
- + modify configure script to ensure that if the C compiler is used
- rather than the loader in making shared libraries, the $(CFLAGS)
-- variable is also used (Redhat Bugzilla #199369).
-+ variable is also used (Redhat #199369).
- + port hashed-db code to db2 and db3.
- + fix a bug in tgetent() from 20060625 and 20060715 changes
-- (patch/analysis by Miroslav Lichvar (see Redhat Bugzilla #202480)).
-+ (patch/analysis by Miroslav Lichvar (see Redhat #202480)).
-
- 20060805
- + updated xterm function-keys terminfo to match xterm #216 -TD
-@@ -2939,7 +4637,7 @@
- of cur_term if the same output was selected. This now reuses it only
- when setupterm() is called from tgetent(), which has no notion of
- separate SCREENs. Note that tgetent() must be called after initscr()
-- or newterm() to use this feature (Redhat Bugzilla #140326).
-+ or newterm() to use this feature (Redhat #140326).
- + add a check in CF_BUILD_CC macro to ensure that developer has given
- the --with-build-cc option when cross-compiling (report by Alexandre
- Campo).
-@@ -3032,7 +4730,7 @@
- entries, e.g., so it can analyze the xterm-8bit entry.
- + add morphos terminfo entry, improve amiga-8bit entry (Pavel Fedin).
- + correct translation of "%%" in terminfo format to termcap, e.g.,
-- using "tic -C" (Redhat Bugzilla #130921).
-+ using "tic -C" (Redhat #130921).
- + modified configure script CF_XOPEN_SOURCE macro to ensure that if
- it defines _POSIX_C_SOURCE, that it defines it to a specific value
- (comp.os.stratus newsgroup comment).
-@@ -3043,9 +4741,9 @@
- However that did find a coding error in Assume_Default_Colors().
- + modify several terminfo entries to ensure xterm mouse and cursor
- visibility are reset in rs2 string: hurd, putty, gnome,
-- konsole-base, mlterm, Eterm, screen (Debian #265784, #55637). The
-- xterm entries are left alone - old ones for compatibility, and the
-- new ones do not require this change. -TD
-+ konsole-base, mlterm, Eterm, screen (Debian #265784, Debian #55637).
-+ The xterm entries are left alone - old ones for compatibility, and
-+ the new ones do not require this change. -TD
-
- 20040814
- + fake a SIGWINCH in newterm() to accommodate buggy terminal emulators
-@@ -3076,8 +4774,8 @@
- + modify "tic -cv" to ignore delays when comparing strings. Also
- modify it to ignore a canceled sgr string, e.g., for terminals which
- cannot properly combine attributes in one control sequence.
-- + corrections for gnome and konsole entries (Redhat Bugzilla #122815,
-- patch by Hans de Goede)
-+ + corrections for gnome and konsole entries (Redhat #122815, patch by
-+ Hans de Goede)
- > terminfo updates -TD
- + make ncsa-m rmacs/smacs consistent with sgr
- + add sgr, rc/sc and ech to syscons entries
-@@ -3090,7 +4788,7 @@
- > terminfo updates -TD
- + add xterm-pc-fkeys
- + review/update gnome and gnome-rh90 entries (prompted by Redhat
-- Bugzilla #122815).
-+ #122815).
- + review/update konsole entries
- + add sgr, correct sgr0 for kterm and mlterm
- + correct tsl string in kterm
-@@ -3503,7 +5201,7 @@
- generated when cross-compiling for DJGPP.
- + modify infocmp to omit check for $TERM for operations that do not
- require it, e.g., "infocmp -e" used to build fallback list (report by
-- Koblinger Egmont).
-+ Egmont Koblinger).
-
- 20031004
- + add terminfo entries for DJGPP.
-@@ -4204,7 +5902,7 @@
- + add a check in kgetch() for cooked characters in the fifo to avoid
- calling fifo_push() when a KEY_RESIZE is available (report/analysis
- by Sam Varshavchik ).
-- + fix an overlooked case for bugzilla #68199 (Philippe Blain).
-+ + fix an overlooked case for Redhat #68199 (Philippe Blain).
- + ensure clearerr() is called before using ferror() e.g., in
- lib_screen.c (report by Philippe Blain).
-
-@@ -4212,7 +5910,7 @@
- + modify lib_screen.c and lib_newwin.c to maintain the SCREEN-specific
- pointers for curscr/stdscr/newscr when scr_save() and scr_restore()
- modify the global curscr/stdscr/newscr variables. Fixes Redhat
-- bugzilla #68199 dated 2002-07-07.
-+ #68199.
- + add checks for null pointer in calls to tparm() and tgoto() based on
- FreeBSD bug report. If ncurses were built with termcap support, and
- the first call to tgoto() were a zero-length string, the result would
-@@ -4245,7 +5943,7 @@
- Olaf Buddenhagen ).
- + modified wresize() to ensure that a failed realloc will not corrupt
- the window structure, and to make subwindows fit within the resized
-- window (completes Debian #87678, #101699)
-+ window (completes Debian #87678, Debian #101699)
-
- 20020803
- + fix an off-by-one in lib_pad.c check for limits of pad (patch by
-@@ -4940,9 +6638,9 @@
- which may be in libutf8.
- + remove some unnecessary text from curs_extend.3x and
- default_colors.3x which caused man-db to make incorrect symbolic
-- links (Debian bug report #99550).
-+ links (Debian #99550).
- + add configure check if cast for _IO_va_list is needed to compile
-- C++ vscan code (Debian bug report #97945).
-+ C++ vscan code (Debian #97945).
- > several patches from Sven Verdoolaege:
- + correct code that used non-standard auto-initialization of a struct,
- which gcc allows (report by Larry Virden).
-@@ -5077,7 +6775,7 @@
- + add some examples of customizing screen's terminfo:
- screen.xterm-xfree86, screen.xterm-r6, screen.teraterm -TD
- + modify screen's terminfo entry to match the khome/kend in screen
-- 3.09.08 (Debian bug report #92215).
-+ 3.09.08 (Debian #92215).
- + correct a memory leak in forms library (report by Stefan Vogtner
- ) (patch by Juergen Pfeifer).
-
-@@ -5091,12 +6789,12 @@
- + add .cc.ii rule to c++ makefile, to get preprocessor output for
- debugging.
- + correct configure script handling of @keyword@ substitutions when the
-- --with-manpage-renames option is given (cf: 20000715, fixes Debian
-- bug #89939).
-+ --with-manpage-renames option is given (cf: 20000715, fixes Debian
-+ #89939).
- + report stack underflow/overflow in tparm() when tic -cv option is
- given.
- + remove spurious "%|" operator from xterm-xfree86 terminfo entry,
-- (reported by Adam Costello , Debian bug #89222).
-+ (reported by Adam Costello , Debian #89222).
-
- 20010310
- + cleanup of newdemo.c, fixing some ambiguous expressions noted by gcc
-@@ -5800,7 +7498,7 @@
- + correct spelling error in terminfo entry name: bq300-rv was given as
- bg300-rv in esr's version.
- + modify redrawwin() macro so its parameter is fully parenthesized
-- (fixes Debian bug report #61088).
-+ (fixes Debian #61088).
- + correct formatting error in dump_entry() which set incorrect column
- value when no newline trimming was needed at the end of an entry,
- before appending "use=" clauses (cf: 960406).
-@@ -6530,7 +8228,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 +8599,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
-@@ -7640,7 +9338,7 @@
- + remove _nc_err_abort() calls when write_entry.c finds a directory but
- cannot write to it, e.g., when translating part/all of /etc/termcap
- (reported by Andreas Jaeger ).
-- (this dates back to 951102, in 1.9.7a).
-+ (this dates back to 951102 in 1.9.7a).
- + minor ifdef fixes to compile with atac and glibc 2.0.5c
- + add check for -lgen when configuring regexpr.h
- + modify Solaris shared-library option "-d y" to "-dy" to workaround
-@@ -8109,7 +9807,7 @@
- + modify tset to look in /etc/ttys or /etc/ttytype if the configuration
- does not have getttynam().
- + extend baudrate table in tset.c to match baudrate() function.
-- + add table entries for 230400 and 460800 bd to baudrate() function.
-+ + add table entries for B230400 and B460800 to baudrate() function.
- + improve breakout logic by allowing it before the first line updated,
- which is what SVr4 curses does (patch by Alexander V. Lukyanov).
- + correct initialization of vcost in relative_move(), for cursor-down
-@@ -8979,15 +10677,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 +10760,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 +10774,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 +10785,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 +10797,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 +10816,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 +10825,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 +10852,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 +10864,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 +10952,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 +10967,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 +10982,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 +10997,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 +11018,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 +11058,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 +11079,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
-Index: README
-Prereq: 1.23
---- ncurses-5.9/README 2006-04-22 22:19:37.000000000 +0000
-+++ ncurses-5.9-20141206/README 2012-08-11 20:11:26.000000000 +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
-Index: README.MinGW
-Prereq: 1.5
---- ncurses-5.9/README.MinGW 2011-02-26 16:57:17.000000000 +0000
-+++ ncurses-5.9-20141206/README.MinGW 2012-09-22 17:46:04.000000000 +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.9 2012/09/22 17:46:04 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,13 @@
- 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.
-+The TERM environment variable must be set specially to active the Windows
-+console-driver. The driver checks if TERM is set to "#win32con" (explicit
-+use) or if TERM is unset or empty (implicit).
-
- 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,62 +70,60 @@
- 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.:
-
-- - Wide Character support
-+ - Wide Character support (display is workable, but input untested)
- The Win32Con driver should actually only use Unicode in the
- future.
- - Thread support (locking). If using TDM toolchain this is done by
-@@ -145,5 +134,5 @@
- - Workarounds for MinGW's filesystem access are necessary to make infocmp
- work (though tic works).
-
--To support terminfo, we need to have an ioctl() simulation for the
--serial and networked Terminals.
-+To support terminfo, we would need to have an ioctl() simulation for the
-+serial and networked terminals.
-Index: VERSION
---- /dev/null 2014-12-07 11:09:34.027922031 +0000
-+++ ncurses-5.9-20141206/VERSION 2014-12-06 13:32:29.000000000 +0000
-@@ -0,0 +1 @@
-+5:0:9 5.9 20141206
-Index: aclocal.m4
-Prereq: 1.553
---- ncurses-5.9/aclocal.m4 2011-03-31 23:35:38.000000000 +0000
-+++ ncurses-5.9-20141206/aclocal.m4 2014-12-06 13:37:21.000000000 +0000
-@@ -1,5 +1,5 @@
- dnl***************************************************************************
--dnl Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. *
-+dnl Copyright (c) 1998-2013,2014 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.719 2014/12/06 13:37:21 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES. The copyright on
-@@ -62,7 +62,33 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ADA_INCLUDE_DIRS version: 6 updated: 2010/02/26 19:52:07
-+dnl CF_ACVERSION_CHECK version: 5 updated: 2014/06/04 19:11:49
-+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([AC_ACVERSION], ,[ifdef([AC_AUTOCONF_VERSION],[m4_copy([AC_AUTOCONF_VERSION],[AC_ACVERSION])],[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])])dnl
-+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: 3 updated: 2012/10/03 18:39:53
-+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: 8 updated: 2013/10/14 04:24:07
- dnl -------------------
- dnl Construct the list of include-options for the C programs in the Ada95
- dnl binding.
-@@ -76,7 +102,7 @@
- ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
- elif test "$includedir" != "/usr/include"; then
- if test "$includedir" = '${prefix}/include' ; then
-- if test $prefix != /usr ; then
-+ if test x$prefix != x/usr ; then
- ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
- fi
- else
-@@ -94,7 +120,7 @@
- AC_SUBST(ADAFLAGS)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
-+dnl CF_ADD_CFLAGS version: 11 updated: 2014/07/22 05:32:57
- dnl -------------
- dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
- dnl The second parameter if given makes this macro verbose.
-@@ -119,7 +145,7 @@
- -D*)
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'`
-
-- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=yes
-
-@@ -156,7 +182,7 @@
-
- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
-
-- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=no
- ;;
-@@ -283,15 +309,33 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ADD_LIBS version: 1 updated: 2010/06/02 05:03:05
-+dnl CF_ADD_LIBS version: 2 updated: 2014/07/13 14:33:27
- dnl -----------
--dnl Add one or more libraries, used to enforce consistency.
-+dnl Add one or more libraries, used to enforce consistency. Libraries are
-+dnl prepended to an existing list, since their dependencies are assumed to
-+dnl already exist in the list.
- dnl
- dnl $1 = libraries to add, with the "-l", etc.
- dnl $2 = variable to update (default $LIBS)
--AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl
-+AC_DEFUN([CF_ADD_LIBS],[
-+cf_add_libs="$1"
-+# Filter out duplicates - this happens with badly-designed ".pc" files...
-+for cf_add_1lib in [$]ifelse($2,,LIBS,[$2])
-+do
-+ for cf_add_2lib in $cf_add_libs
-+ do
-+ if test "x$cf_add_1lib" = "x$cf_add_2lib"
-+ then
-+ cf_add_1lib=
-+ break
-+ fi
-+ done
-+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+done
-+ifelse($2,,LIBS,[$2])="$cf_add_libs"
-+])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ADD_SUBDIR_PATH version: 3 updated: 2010/07/03 20:58:12
-+dnl CF_ADD_SUBDIR_PATH version: 4 updated: 2013/10/08 17:47:05
- dnl ------------------
- dnl Append to a search-list for a nonstandard header/lib-file
- dnl $1 = the variable to return as result
-@@ -301,9 +345,9 @@
- dnl $5 = a directory that we do not want $4 to match
- AC_DEFUN([CF_ADD_SUBDIR_PATH],
- [
--test "$4" != "$5" && \
-+test "x$4" != "x$5" && \
- test -d "$4" && \
--ifelse([$5],NONE,,[(test $5 = NONE || test "$4" != "$5") &&]) {
-+ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]) {
- test -n "$verbose" && echo " ... testing for $3-directories under $4"
- test -d $4/$3 && $1="[$]$1 $4/$3"
- test -d $4/$3/$2 && $1="[$]$1 $4/$3/$2"
-@@ -313,76 +357,6 @@
- }
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32
--dnl ----------------
--dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
--dnl in the sharutils 4.2 distribution.
--AC_DEFUN([CF_ANSI_CC_CHECK],
--[
--AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[
--cf_cv_ansi_cc=no
--cf_save_CFLAGS="$CFLAGS"
--cf_save_CPPFLAGS="$CPPFLAGS"
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX -qlanglvl=ansi
--# Ultrix and OSF/1 -std1
--# HP-UX -Aa -D_HPUX_SOURCE
--# SVR4 -Xc
--# UnixWare 1.2 (cannot use -Xc, since ANSI/POSIX clashes)
--for cf_arg in "-DCC_HAS_PROTOS" \
-- "" \
-- -qlanglvl=ansi \
-- -std1 \
-- -Ae \
-- "-Aa -D_HPUX_SOURCE" \
-- -Xc
--do
-- CF_ADD_CFLAGS($cf_arg)
-- AC_TRY_COMPILE(
--[
--#ifndef CC_HAS_PROTOS
--#if !defined(__STDC__) || (__STDC__ != 1)
--choke me
--#endif
--#endif
--],[
-- int test (int i, double x);
-- struct s1 {int (*f) (int a);};
-- struct s2 {int (*f) (double a);};],
-- [cf_cv_ansi_cc="$cf_arg"; break])
--done
--CFLAGS="$cf_save_CFLAGS"
--CPPFLAGS="$cf_save_CPPFLAGS"
--])
--
--if test "$cf_cv_ansi_cc" != "no"; then
--if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then
-- CF_ADD_CFLAGS($cf_cv_ansi_cc)
--else
-- AC_DEFINE(CC_HAS_PROTOS)
--fi
--fi
--])dnl
--dnl ---------------------------------------------------------------------------
--dnl CF_ANSI_CC_REQD version: 4 updated: 2008/03/23 14:48:54
--dnl ---------------
--dnl For programs that must use an ANSI compiler, obtain compiler options that
--dnl will make it recognize prototypes. We'll do preprocessor checks in other
--dnl macros, since tools such as unproto can fake prototypes, but only part of
--dnl the preprocessor.
--AC_DEFUN([CF_ANSI_CC_REQD],
--[AC_REQUIRE([CF_ANSI_CC_CHECK])
--if test "$cf_cv_ansi_cc" = "no"; then
-- AC_MSG_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
-- c. use a wrapper such as unproto])
--fi
--])dnl
--dnl ---------------------------------------------------------------------------
- dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
- dnl --------------
- dnl Allow user to disable a normally-on option.
-@@ -465,7 +439,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 +453,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
-@@ -536,7 +510,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_BOOL_SIZE version: 12 updated: 2006/12/16 12:33:30
-+dnl CF_BOOL_SIZE version: 13 updated: 2013/04/13 18:03:21
- dnl ------------
- dnl Test for the size of 'bool' in the configured C++ compiler (e.g., a type).
- dnl Don't bother looking for bool.h, since it's been deprecated.
-@@ -570,7 +544,7 @@
-
- #endif
-
--main()
-+int main()
- {
- FILE *fp = fopen("cf_test.out", "w");
- if (fp != 0) {
-@@ -604,7 +578,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_BUILD_CC version: 6 updated: 2006/10/14 15:23:15
-+dnl CF_BUILD_CC version: 7 updated: 2012/10/06 15:31:55
- dnl -----------
- dnl If we're cross-compiling, allow the user to override the tools and their
- dnl options. The configure script is oriented toward identifying the host
-@@ -614,7 +588,8 @@
- dnl $1 = default for $CPPFLAGS
- dnl $2 = default for $LIBS
- AC_DEFUN([CF_BUILD_CC],[
--AC_REQUIRE([CF_PROG_EXT])
-+CF_ACVERSION_CHECK(2.52,,
-+ [AC_REQUIRE([CF_PROG_EXT])])
- if test "$cross_compiling" = yes ; then
-
- # defaults that we might want to override
-@@ -695,7 +670,33 @@
- AC_SUBST(BUILD_OBJEXT)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CFG_DEFAULTS version: 7 updated: 2005/09/24 16:15:00
-+dnl CF_CC_ENV_FLAGS version: 1 updated: 2012/10/03 05:25:49
-+dnl ---------------
-+dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
-+dnl into CC. This will not help with broken scripts that wrap the compiler with
-+dnl options, but eliminates a more common category of user confusion.
-+AC_DEFUN([CF_CC_ENV_FLAGS],
-+[
-+# This should have been defined by AC_PROG_CC
-+: ${CC:=cc}
-+
-+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
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_CFG_DEFAULTS version: 10 updated: 2013/09/07 13:54:05
- 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 +714,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*|msys*|k*bsd*-gnu|mingw*)
- prefix=/usr
- ;;
- *) prefix=$ac_default_prefix
-@@ -749,30 +750,51 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CGETENT version: 3 updated: 2000/08/12 23:18:52
-+dnl CF_CGETENT version: 5 updated: 2012/10/06 17:56:13
- 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,1,[Define to 1 if we 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,[Define to const if needed for some BSD cgetent variations])
-+ fi
-+fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59
-+dnl CF_CHECK_CACHE version: 12 updated: 2012/10/02 20:55:03
- dnl --------------
- dnl Check if we're accidentally using a cache from a different machine.
- dnl Derive the system name, as a check for reusing the autoconf cache.
-@@ -795,7 +817,7 @@
- system_name="`(hostname) 2>/dev/null`"
- fi
- fi
--test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name")
-+test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name",[Define to the system name.])
- AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$system_name"])
-
- test -z "$system_name" && system_name="$cf_cv_system_name"
-@@ -908,7 +930,82 @@
- fi
- ])])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CPP_PARAM_INIT version: 4 updated: 2001/04/07 22:31:18
-+dnl CF_CHECK_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09
-+dnl ------------------------
-+dnl Show the version of libtool
-+dnl
-+dnl Save the version in a cache variable - this is not entirely a good thing,
-+dnl but the version string from libtool is very ugly, and for bug reports it
-+dnl might be useful to have the original string.
-+AC_DEFUN([CF_CHECK_LIBTOOL_VERSION],[
-+if test -n "$LIBTOOL" && test "$LIBTOOL" != none
-+then
-+ AC_MSG_CHECKING(version of $LIBTOOL)
-+ CF_LIBTOOL_VERSION
-+ AC_MSG_RESULT($cf_cv_libtool_version)
-+ if test -z "$cf_cv_libtool_version" ; then
-+ AC_MSG_ERROR(This is not GNU libtool)
-+ fi
-+else
-+ AC_MSG_ERROR(GNU libtool has not been found)
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+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: 2 updated: 2013/11/19 19:23:35
-+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 = CLANG_COMPILER (default)
-+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: 6 updated: 2012/10/06 17:56:13
- 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 +1029,7 @@
- {
- value = x;
- }
--void main() { }
-+int main() { }
- ],
- [cf_cv_cpp_param_init=yes],
- [cf_cv_cpp_param_init=no],
-@@ -940,10 +1037,10 @@
- AC_LANG_RESTORE
- ])
- fi
--test "$cf_cv_cpp_param_init" = yes && AC_DEFINE(CPP_HAS_PARAM_INIT)
-+test "$cf_cv_cpp_param_init" = yes && AC_DEFINE(CPP_HAS_PARAM_INIT,1,[Define to 1 if C++ has parameter initialization])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CPP_STATIC_CAST version: 1 updated: 2005/07/23 16:52:43
-+dnl CF_CPP_STATIC_CAST version: 3 updated: 2013/04/13 18:03:21
- dnl ------------------
- dnl Check if the C++ compiler accepts static_cast in generics. This appears to
- dnl not be supported in g++ before 3.0
-@@ -965,7 +1062,7 @@
- int begin_x = 0)
- {
- }
--
-+ NCursesPanel();
- ~NCursesPanel();
- };
-
-@@ -996,10 +1093,58 @@
-
- fi
-
--test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST)
-+test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST,1,[Define to 1 if C++ has static_cast])
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+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_C_INLINE version: 3 updated: 2010/05/01 15:14:41
-+dnl CF_CXX_IOSTREAM_NAMESPACE version: 2 updated: 2012/10/06 17:56:13
-+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,1,[Define to 1 if C++ has namespace iostream])
-+ 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 +1157,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,7 +1205,55 @@
- AC_SUBST(DIRS_TO_MAKE)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_DISABLE_LEAKS version: 6 updated: 2010/07/23 04:14:32
-+dnl CF_DISABLE_ECHO version: 12 updated: 2012/10/06 16:30:28
-+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 do not 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_GNAT_PROJECTS version: 1 updated: 2014/06/01 11:34:00
-+dnl ------------------------
-+AC_DEFUN([CF_DISABLE_GNAT_PROJECTS],[
-+AC_MSG_CHECKING(if we want to use GNAT projects)
-+CF_ARG_DISABLE(gnat-projects,
-+ [ --disable-gnat-projects test: disable GNAT projects even if usable],
-+ [enable_gnat_projects=no],
-+ [enable_gnat_projects=yes])
-+AC_MSG_RESULT($enable_gnat_projects)
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_DISABLE_LEAKS version: 7 updated: 2012/10/02 20:55:03
- dnl ----------------
- dnl Combine no-leak checks with the libraries or tools that are used for the
- dnl checks.
-@@ -1075,12 +1271,12 @@
- AC_MSG_RESULT($with_no_leaks)
-
- if test "$with_no_leaks" = yes ; then
-- AC_DEFINE(NO_LEAKS)
-- AC_DEFINE(YY_NO_LEAKS)
-+ AC_DEFINE(NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
-+ AC_DEFINE(YY_NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_DISABLE_LIBTOOL_VERSION version: 1 updated: 2010/05/15 15:45:59
-+dnl CF_DISABLE_LIBTOOL_VERSION version: 2 updated: 2014/11/15 19:05:29
- dnl --------------------------
- dnl Check if we should use the libtool 1.5 feature "-version-number" instead of
- dnl the older "-version-info" feature. The newer feature allows us to use
-@@ -1099,8 +1295,25 @@
- LIBTOOL_VERSION="-version-number"
- else
- LIBTOOL_VERSION="-version-info"
-+ case "x$VERSION" in #(vi
-+ x) #(vi
-+ AC_MSG_WARN(VERSION was not set)
-+ ;;
-+ x*.*.*)
-+ ABI_VERSION="$VERSION"
-+ CF_VERBOSE(ABI_VERSION: $ABI_VERSION)
-+ ;;
-+ x*:*:*)
-+ ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'`
-+ CF_VERBOSE(ABI_VERSION: $ABI_VERSION)
-+ ;;
-+ *)
-+ AC_MSG_WARN(unexpected VERSION value: $VERSION)
-+ ;;
-+ esac
- fi
-
-+AC_SUBST(ABI_VERSION)
- AC_SUBST(LIBTOOL_VERSION)
- ])dnl
- dnl ---------------------------------------------------------------------------
-@@ -1123,6 +1336,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 +1374,37 @@
- AC_MSG_RESULT($cf_cv_enable_rpath)
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_ENABLE_STRING_HACKS version: 3 updated: 2013/01/26 16:26:12
-+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,1,[Define to 1 to work around bogus compiler/loader warnings])
-+ 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 +1413,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 +1422,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 +1441,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,7 +1579,69 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_FUNC_DLSYM version: 2 updated: 2010/05/29 16:31:02
-+dnl CF_FIND_SUB_INCDIR version: 1 updated: 2014/04/12 16:47:01
-+dnl ------------------
-+dnl Find an include-directory with the given leaf-name. This is useful for
-+dnl example with FreeBSD ports, which use this convention to distinguish
-+dnl different versions of the same port.
-+AC_DEFUN([CF_FIND_SUB_INCDIR],[
-+ CF_SUBDIR_PATH(cf_search,$1,include)
-+ for cf_item in $cf_search
-+ do
-+ case $cf_item in #(vi
-+ */$1)
-+ CF_ADD_INCDIR($cf_item)
-+ ;;
-+ esac
-+ done
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_FIND_SUB_LIBDIR version: 1 updated: 2014/04/12 16:47:01
-+dnl ------------------
-+dnl Find a library-directory with the given leaf-name. This is useful for
-+dnl example with FreeBSD ports, which use this convention to distinguish
-+dnl different versions of the same port.
-+AC_DEFUN([CF_FIND_SUB_LIBDIR],[
-+ CF_SUBDIR_PATH(cf_search,$1,lib)
-+ for cf_item in $cf_search
-+ do
-+ case $cf_item in #(vi
-+ */$1)
-+ CF_ADD_LIBDIR($cf_item)
-+ ;;
-+ esac
-+ done
-+])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_FORGET_TOOL version: 1 updated: 2013/04/06 18:03:09
-+dnl --------------
-+dnl Forget that we saw the given tool.
-+AC_DEFUN([CF_FORGET_TOOL],[
-+unset ac_cv_prog_ac_ct_$1
-+unset ac_ct_$1
-+unset $1
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_FUNC_DLSYM version: 3 updated: 2012/10/06 11:17:15
- dnl -------------
- dnl Test for dlsym() and related functions, as well as libdl.
- dnl
-@@ -1332,7 +1668,7 @@
- dlclose(obj);
- }
- }],[
-- AC_DEFINE(HAVE_LIBDL)],[
-+ AC_DEFINE(HAVE_LIBDL,1,[Define to 1 if we have dl library])],[
- AC_MSG_ERROR(Cannot link test program for libdl)])
- AC_MSG_RESULT(ok)
- else
-@@ -1340,7 +1676,7 @@
- fi
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_FUNC_MEMMOVE version: 7 updated: 2006/12/16 12:33:30
-+dnl CF_FUNC_MEMMOVE version: 8 updated: 2012/10/04 20:12:20
- dnl ---------------
- dnl Check for memmove, or a bcopy that can handle overlapping copy. If neither
- dnl is found, add our own version of memmove to the list of objects.
-@@ -1365,13 +1701,13 @@
- ])
- ],[cf_cv_good_bcopy=no])
- if test "$cf_cv_good_bcopy" = yes ; then
-- AC_DEFINE(USE_OK_BCOPY)
-+ AC_DEFINE(USE_OK_BCOPY,1,[Define to 1 to use bcopy when memmove is unavailable])
- else
-- AC_DEFINE(USE_MY_MEMMOVE)
-+ AC_DEFINE(USE_MY_MEMMOVE,1,[Define to 1 to use replacement function when memmove is unavailable])
- fi
- ])])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_FUNC_NANOSLEEP version: 3 updated: 2006/12/16 12:33:30
-+dnl CF_FUNC_NANOSLEEP version: 4 updated: 2012/10/06 17:56:13
- dnl -----------------
- dnl Check for existence of workable nanosleep() function. Some systems, e.g.,
- dnl AIX 4.x, provide a non-working version.
-@@ -1402,7 +1738,7 @@
- [cf_cv_func_nanosleep=no],
- [cf_cv_func_nanosleep=unknown])])
-
--test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP)
-+test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP,1,[Define to 1 if we have nanosleep()])
- ])
- dnl ---------------------------------------------------------------------------
- dnl CF_FUNC_OPENPTY version: 3 updated: 2010/05/29 16:31:02
-@@ -1433,14 +1769,17 @@
- ])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_FUNC_POLL version: 4 updated: 2006/12/16 12:33:30
-+dnl CF_FUNC_POLL version: 8 updated: 2012/10/04 05:24:07
- 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,19 +1789,42 @@
- 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],
- [cf_cv_working_poll=unknown])])
--test "$cf_cv_working_poll" = "yes" && AC_DEFINE(HAVE_WORKING_POLL)
-+test "$cf_cv_working_poll" = "yes" && AC_DEFINE(HAVE_WORKING_POLL,1,[Define to 1 if the poll function seems to work])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_FUNC_TERMIOS version: 2 updated: 2000/07/22 23:37:24
-+dnl CF_FUNC_TERMIOS version: 3 updated: 2012/10/06 17:56:13
- dnl ---------------
- dnl Some old/broken variations define tcgetattr() only as a macro in
- dnl termio(s).h
-@@ -1488,10 +1850,10 @@
- tcgetattr(1, &foo);],
- [cf_cv_have_tcgetattr=yes],
- [cf_cv_have_tcgetattr=no])])
--test "$cf_cv_have_tcgetattr" = yes && AC_DEFINE(HAVE_TCGETATTR)
-+test "$cf_cv_have_tcgetattr" = yes && AC_DEFINE(HAVE_TCGETATTR,1,[Define to 1 if we have tcgetattr])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_FUNC_VSSCANF version: 3 updated: 2001/12/19 00:50:10
-+dnl CF_FUNC_VSSCANF version: 4 updated: 2012/10/06 17:56:13
- dnl ---------------
- dnl Check for vsscanf() function, which is in c9x but generally not in earlier
- dnl versions of C. It is in the GNU C library, and can often be simulated by
-@@ -1529,14 +1891,14 @@
- cf_cv_func_vsscanf=no])])])])
-
- case $cf_cv_func_vsscanf in #(vi
--vsscanf) AC_DEFINE(HAVE_VSSCANF);; #(vi
--vfscanf) AC_DEFINE(HAVE_VFSCANF);; #(vi
--_doscan) AC_DEFINE(HAVE__DOSCAN);;
-+vsscanf) AC_DEFINE(HAVE_VSSCANF,1,[Define to 1 if we have vsscanf]);; #(vi
-+vfscanf) AC_DEFINE(HAVE_VFSCANF,1,[Define to 1 if we have vfscanf]);; #(vi
-+_doscan) AC_DEFINE(HAVE__DOSCAN,1,[Define to 1 if we have _doscan]);;
- esac
-
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32
-+dnl CF_GCC_ATTRIBUTES version: 16 updated: 2012/10/02 20:55:03
- dnl -----------------
- dnl Test for availability of useful gcc __attribute__ directives to quiet
- dnl compiler warnings. Though useful, not all are supported -- and contrary
-@@ -1614,27 +1976,27 @@
- test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
- cat conftest.h >>confdefs.h
- case $cf_attribute in #(vi
-+ noreturn) #(vi
-+ AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
-+ ;;
- printf) #(vi
-- if test "$cf_printf_attribute" = no ; then
-- cat >>confdefs.h <>confdefs.h <>confdefs.h <>confdefs.h < 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,1,[Define to 1 if getopt variables are declared in header])
-+fi
-+if test $cf_cv_getopt_header = getopt.h ; then
-+ AC_DEFINE(NEED_GETOPT_H,1,[Define to 1 if we must include getopt.h])
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_GNATPREP_OPT_T version: 1 updated: 2014/08/02 18:37:25
-+dnl -----------------
-+AC_DEFUN([CF_GNATPREP_OPT_T],[
-+AC_CACHE_CHECK(if GNATPREP supports -T option,cf_cv_gnatprep_opt_t,[
-+cf_cv_gnatprep_opt_t=no
-+gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
-+])
-+test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
-+AC_SUBST(GNATPREP_OPTS)
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_GNAT_GENERICS version: 2 updated: 2011/03/23 20:24:41
- dnl ----------------
- AC_DEFUN([CF_GNAT_GENERICS],
-@@ -1799,53 +2210,26 @@
- AC_SUBST(cf_generic_objects)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_GNAT_PRAGMA_UNREF version: 1 updated: 2010/06/19 15:22:18
--dnl --------------------
--dnl Check if the gnat pragma "Unreferenced" works.
--AC_DEFUN([CF_GNAT_PRAGMA_UNREF],[
--AC_CACHE_CHECK(if GNAT pragma Unreferenced works,cf_cv_pragma_unreferenced,[
--CF_GNAT_TRY_LINK([procedure conftest;],
--[with Text_IO;
--with GNAT.OS_Lib;
--procedure conftest is
-- test : Integer;
-- pragma Unreferenced (test);
--begin
-- test := 1;
-- Text_IO.Put ("Hello World");
-- Text_IO.New_Line;
-- GNAT.OS_Lib.OS_Exit (0);
--end conftest;],
-- [cf_cv_pragma_unreferenced=yes],
-- [cf_cv_pragma_unreferenced=no])])
--
--# if the pragma is supported, use it (needed in the Trace code).
--if test $cf_cv_pragma_unreferenced = yes ; then
-- PRAGMA_UNREF=TRUE
--else
-- PRAGMA_UNREF=FALSE
--fi
--AC_SUBST(PRAGMA_UNREF)
--])dnl
--dnl ---------------------------------------------------------------------------
--dnl CF_GNAT_PROJECTS version: 2 updated: 2011/03/23 20:24:41
-+dnl CF_GNAT_PROJECTS version: 7 updated: 2014/06/01 10:46:34
- dnl ----------------
- dnl GNAT projects are configured with ".gpr" project files.
- dnl GNAT libraries are a further development, using the project feature.
- AC_DEFUN([CF_GNAT_PROJECTS],
- [
- AC_REQUIRE([CF_GNAT_VERSION])
-+AC_REQUIRE([CF_DISABLE_GNAT_PROJECTS])
-
- cf_gnat_libraries=no
- cf_gnat_projects=no
-
-+if test "$enable_gnat_projects" != no ; then
- AC_MSG_CHECKING(if GNAT supports project files)
- case $cf_gnat_version in #(vi
- 3.[[0-9]]*) #(vi
- ;;
- *)
- case $cf_cv_system_name in #(vi
-- cygwin*) #(vi
-+ cygwin*|msys*) #(vi
- ;;
- *)
- mkdir conftest.src conftest.bin conftest.lib
-@@ -1862,14 +2246,6 @@
- for Library_Dir use External("BUILD_DIR");
- Source_Dir := External ("SOURCE_DIR");
- for Source_Dirs use (Source_Dir);
-- package Compiler is
-- for Default_Switches ("Ada") use
-- ("-g",
-- "-O2",
-- "-gnatafno",
-- "-gnatVa", -- All validity checks
-- "-gnatwa"); -- Activate all optional errors
-- end Compiler;
- end Library;
- CF_EOF
- cat >>confpackage.ads <
-@@ -2129,28 +2506,28 @@
- [two_arg_error_handler_t foo2 = lib_error_handler],
- [cf_cxx_library=yes
- CF_ADD_LIB($cf_gpp_libname,CXXLIBS)
-- AC_DEFINE(HAVE_BUILTIN_H)],
-+ AC_DEFINE(HAVE_BUILTIN_H,1,[Define to 1 if we have builtin.h])],
- [cf_cxx_library=no])])
- LIBS="$cf_save"
- AC_MSG_RESULT($cf_cxx_library)
- 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: 8 updated: 2013/11/16 14:27:53
- dnl ---------------
- dnl Check if the compiler supports useful warning options.
- dnl
-@@ -2173,6 +2550,7 @@
- [
-
- CF_INTEL_COMPILER(GXX,INTEL_CPLUSPLUS,CXXFLAGS)
-+CF_CLANG_COMPILER(GXX,CLANG_CPLUSPLUS,CXXFLAGS)
-
- AC_REQUIRE([CF_GXX_VERSION])
-
-@@ -2238,16 +2616,17 @@
- for cf_opt in \
- Wabi \
- fabi-version=0 \
-+ Wextra \
-+ Wignored-qualifiers \
-+ Wlogical-op \
- Woverloaded-virtual \
- Wsign-promo \
- Wsynth \
- Wold-style-cast \
- Wcast-align \
- Wcast-qual \
-- Wmissing-prototypes \
- Wpointer-arith \
- Wshadow \
-- Wstrict-prototypes \
- Wundef $cf_gxx_extra_warnings $1
- do
- CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-@@ -2266,7 +2645,7 @@
- AC_SUBST(EXTRA_CXXFLAGS)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_HASHED_DB version: 4 updated: 2010/05/29 16:31:02
-+dnl CF_HASHED_DB version: 5 updated: 2014/04/12 16:47:01
- dnl ------------
- dnl Look for an instance of the Berkeley hashed database.
- dnl
-@@ -2281,6 +2660,16 @@
- if test -d "$1" ; then
- CF_ADD_INCDIR($1/include)
- CF_ADD_LIBDIR($1/lib)
-+ else
-+ case "$1" in #(vi
-+ ./*|../*|/*)
-+ AC_MSG_WARN(no such directory $1)
-+ ;; #(vi
-+ *)
-+ CF_FIND_SUB_INCDIR($1)
-+ CF_FIND_SUB_LIBDIR($1)
-+ ;;
-+ esac
- fi
- esac
- ])
-@@ -2373,7 +2762,7 @@
- ])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_HASHED_DB_VERSION version: 3 updated: 2007/12/01 15:01:37
-+dnl CF_HASHED_DB_VERSION version: 4 updated: 2014/04/12 16:47:01
- dnl --------------------
- dnl Given that we have the header file for hashed database, find the version
- dnl information.
-@@ -2382,7 +2771,7 @@
- AC_CACHE_CHECK(for version of db, cf_cv_hashed_db_version,[
- cf_cv_hashed_db_version=unknown
-
--for cf_db_version in 1 2 3 4 5
-+for cf_db_version in 1 2 3 4 5 6
- do
- CF_MSG_LOG(checking for db version $cf_db_version)
- AC_TRY_COMPILE([
-@@ -2464,33 +2853,24 @@
- [AC_DIVERT_HELP([$1])dnl
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_INCLUDE_DIRS version: 6 updated: 2009/01/06 19:37:40
-+dnl CF_INCLUDE_DIRS version: 10 updated: 2014/09/19 20:58:42
- dnl ---------------
- dnl Construct the list of include-options according to whether we're building
--dnl in the source directory or using '--srcdir=DIR' option. If we're building
--dnl with gcc, don't append the includedir if it happens to be /usr/include,
--dnl since that usually breaks gcc's shadow-includes.
-+dnl in the source directory or using '--srcdir=DIR' option.
- AC_DEFUN([CF_INCLUDE_DIRS],
- [
--CPPFLAGS="$CPPFLAGS -I. -I../include"
- if test "$srcdir" != "."; then
-- CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
-+ CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
- fi
--if test "$GCC" != yes; then
-- CPPFLAGS="$CPPFLAGS -I\${includedir}"
--elif test "$includedir" != "/usr/include"; then
-- if test "$includedir" = '${prefix}/include' ; then
-- if test $prefix != /usr ; then
-- CPPFLAGS="$CPPFLAGS -I\${includedir}"
-- fi
-- else
-- CPPFLAGS="$CPPFLAGS -I\${includedir}"
-- fi
-+CPPFLAGS="-I../include $CPPFLAGS"
-+if test "$srcdir" != "."; then
-+ CPPFLAGS="-I\${srcdir} $CPPFLAGS"
- fi
-+CPPFLAGS="-I. $CPPFLAGS"
- AC_SUBST(CPPFLAGS)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_INTEL_COMPILER version: 4 updated: 2010/05/26 05:38:42
-+dnl CF_INTEL_COMPILER version: 6 updated: 2014/03/17 13:13:07
- dnl -----------------
- dnl Check if the given compiler is really the Intel compiler for Linux. It
- dnl tries to imitate gcc, but does not return an error when it finds a mismatch
-@@ -2504,6 +2884,7 @@
- dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
- dnl $3 = CFLAGS (default) or CXXFLAGS
- AC_DEFUN([CF_INTEL_COMPILER],[
-+AC_REQUIRE([AC_CANONICAL_HOST])
- ifelse([$2],,INTEL_COMPILER,[$2])=no
-
- if test "$ifelse([$1],,[$1],GCC)" = yes ; then
-@@ -2518,7 +2899,7 @@
- make an error
- #endif
- ],[ifelse([$2],,INTEL_COMPILER,[$2])=yes
--cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-+cf_save_CFLAGS="$cf_save_CFLAGS -we147"
- ],[])
- ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
- AC_MSG_RESULT($ifelse([$2],,INTEL_COMPILER,[$2]))
-@@ -2527,7 +2908,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ISASCII version: 3 updated: 2000/08/12 23:18:52
-+dnl CF_ISASCII version: 4 updated: 2012/10/06 17:56:13
- dnl ----------
- dnl Check if we have either a function or macro for 'isascii()'.
- AC_DEFUN([CF_ISASCII],
-@@ -2539,10 +2920,10 @@
- [cf_cv_have_isascii=no])
- ])dnl
- AC_MSG_RESULT($cf_cv_have_isascii)
--test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII)
-+test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII,1,[Define to 1 if we have isascii()])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LARGEFILE version: 7 updated: 2007/06/02 11:58:50
-+dnl CF_LARGEFILE version: 8 updated: 2012/10/06 08:57:51
- dnl ------------
- dnl Add checks for large file support.
- AC_DEFUN([CF_LARGEFILE],[
-@@ -2576,12 +2957,12 @@
- [cf_cv_struct_dirent64=yes],
- [cf_cv_struct_dirent64=no])
- ])
-- test "$cf_cv_struct_dirent64" = yes && AC_DEFINE(HAVE_STRUCT_DIRENT64)
-+ test "$cf_cv_struct_dirent64" = yes && AC_DEFINE(HAVE_STRUCT_DIRENT64,1,[Define to 1 if we have struct dirent64])
- fi
- ])
- ])
- 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 +2983,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 +3033,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 +3064,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 +3085,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 +3147,23 @@
- $1="$cf_library_path_list [$]$1"
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16
-+dnl CF_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09
-+dnl ------------------
-+AC_DEFUN([CF_LIBTOOL_VERSION],[
-+if test -n "$LIBTOOL" && test "$LIBTOOL" != none
-+then
-+ cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
-+else
-+ cf_cv_libtool_version=
-+fi
-+test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+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,11 +3176,11 @@
- AC_SUBST(LIB_PREFIX)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_RULES version: 61 updated: 2010/10/23 16:10:30
-+dnl CF_LIB_RULES version: 75 updated: 2014/09/20 20:16:32
- 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
--dnl subdirectory is a library-source directory, modify the LIBS_TO_MAKE list in
-+dnl subdirectory is a library-source directory, modify the Libs_To_Make list in
- dnl the corresponding makefile to list the models that we'll generate.
- dnl
- dnl For shared libraries, make a list of symbolic links to construct when
-@@ -2786,15 +3189,19 @@
- dnl lib.so ->
- dnl lib.so. ->
- dnl lib.so..
-+dnl
-+dnl Note: Libs_To_Make is mixed case, since it is not a pure autoconf variable.
- 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|msysdll|mingw)
- TINFO_NAME=$TINFO_ARG_SUFFIX
- TINFO_SUFFIX=.dll
--fi
-+ ;;
-+esac
-
- if test -n "$TINFO_SUFFIX" ; then
- case $TINFO_SUFFIX in
-@@ -2820,79 +3227,78 @@
- elif test -f $srcdir/$cf_dir/modules; then
-
- SHARED_LIB=
-- LIBS_TO_MAKE=
-+ Libs_To_Make=
- for cf_item in $cf_LIST_MODELS
- do
- CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)
-+ cf_libname=$cf_dir
-+ test "$cf_dir" = c++ && cf_libname=ncurses++
- if test $cf_item = shared ; then
-- if test "$cf_cv_do_symlinks" = yes ; then
-- case "$cf_cv_shlib_version" in #(vi
-- rel) #(vi
-- case "$cf_cv_system_name" in #(vi
-- darwin*)
-- case .${LIB_SUFFIX} in
-- .tw*)
-- cf_suffix=`echo $cf_suffix | sed 's/^tw//'`
-- cf_suffix=tw'.${REL_VERSION}'"$cf_suffix"
-- ;;
-- .t*)
-- cf_suffix=`echo $cf_suffix | sed 's/^t//'`
-- cf_suffix=t'.${REL_VERSION}'"$cf_suffix"
-- ;;
-- .w*)
-- cf_suffix=`echo $cf_suffix | sed 's/^w//'`
-- cf_suffix=w'.${REL_VERSION}'"$cf_suffix"
-+ if test -n "${LIB_SUFFIX}"
-+ then
-+ cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${LIB_SUFFIX}"'//'`
-+ else
-+ cf_shared_suffix="$cf_suffix"
-+ fi
-+ if test "$cf_cv_do_symlinks" = yes ; then
-+ cf_version_name=
-+
-+ case "$cf_cv_shlib_version" in #(vi
-+ rel) #(vi
-+ cf_version_name=REL_VERSION
- ;;
-- *)
-- cf_suffix='.${REL_VERSION}'"$cf_suffix"
-+ abi)
-+ cf_version_name=ABI_VERSION
- ;;
- esac
-- ;; #(vi
-- *) cf_suffix="$cf_suffix"'.${REL_VERSION}' ;;
-- esac
-- ;;
-- abi)
-- case "$cf_cv_system_name" in #(vi
-- darwin*)
-- case .${LIB_SUFFIX} in
-- .tw*)
-- cf_suffix=`echo $cf_suffix | sed 's/^tw//'`
-- cf_suffix=tw'.${ABI_VERSION}'"$cf_suffix"
-- ;;
-- .t*)
-- cf_suffix=`echo $cf_suffix | sed 's/^t//'`
-- cf_suffix=t'.${ABI_VERSION}'"$cf_suffix"
-- ;;
-- .w*)
-- cf_suffix=`echo $cf_suffix | sed 's/^w//'`
-- cf_suffix=w'.${ABI_VERSION}'"$cf_suffix"
-- ;;
-- *)
-- cf_suffix='.${ABI_VERSION}'"$cf_suffix"
-- ;;
-- esac
-- ;; #(vi
-- *) cf_suffix="$cf_suffix"'.${ABI_VERSION}' ;;
-- esac
-+
-+ if test -n "$cf_version_name"
-+ then
-+ case "$cf_cv_system_name" in #(vi
-+ darwin*)
-+ # "w", etc?
-+ cf_suffix="${LIB_SUFFIX}"'.${'$cf_version_name'}'"$cf_shared_suffix"
-+ ;; #(vi
-+ *)
-+ cf_suffix="$cf_suffix"'.${'$cf_version_name'}'
-+ ;;
-+ esac
-+ fi
-+ if test -n "${LIB_SUFFIX}"
-+ then
-+ cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${LIB_SUFFIX}"'//'`
-+ else
-+ cf_shared_suffix="$cf_suffix"
-+ fi
-+ fi
-+ # 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.
-+ 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_libname}${cf_cygsuf}"
-+ continue
-+ ;;
-+ msysdll) #(vi
-+ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
-+ Libs_To_Make="$Libs_To_Make ../lib/msys-${cf_libname}${cf_cygsuf}"
-+ continue
-+ ;;
-+ mingw)
-+ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
-+ Libs_To_Make="$Libs_To_Make ../lib/lib${cf_libname}${cf_cygsuf}"
-+ continue
- ;;
- esac
- fi
-- # 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
-- 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
-- fi
-- LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/${cf_prefix}${cf_dir}${cf_suffix}"
-+ Libs_To_Make="$Libs_To_Make ../lib/${cf_prefix}${cf_libname}${cf_suffix}"
- done
-
- if test $cf_dir = ncurses ; then
- cf_subsets="$LIB_SUBSETS"
- cf_r_parts="$cf_subsets"
-- cf_liblist="$LIBS_TO_MAKE"
-+ cf_liblist="$Libs_To_Make"
-
- while test -n "$cf_r_parts"
- do
-@@ -2912,7 +3318,7 @@
- ;;
- esac
- if test -n "$cf_item"; then
-- LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
-+ Libs_To_Make="$cf_item $Libs_To_Make"
- fi
- else
- break
-@@ -2922,13 +3328,40 @@
- cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'`
- fi
-
-- sed -e "s%@LIBS_TO_MAKE@%$LIBS_TO_MAKE%" \
-+ if test $cf_dir = c++; then
-+ if test "x$with_shared_cxx" != xyes && test -n "$cf_shared_suffix"; then
-+ cf_list=
-+ for cf_item in $Libs_To_Make
-+ do
-+ case $cf_item in
-+ *.a)
-+ ;;
-+ *)
-+ cf_item=`echo "$cf_item" | sed -e "s,"$cf_shared_suffix",.a,"`
-+ ;;
-+ esac
-+ for cf_test in $cf_list
-+ do
-+ if test "$cf_test" = "$cf_item"
-+ then
-+ cf_LIST_MODELS=`echo "$cf_LIST_MODELS" | sed -e 's/normal//'`
-+ cf_item=
-+ break
-+ fi
-+ done
-+ test -n "$cf_item" && cf_list="$cf_list $cf_item"
-+ done
-+ Libs_To_Make="$cf_list"
-+ fi
-+ fi
-+
-+ sed -e "s%@Libs_To_Make@%$Libs_To_Make%" \
- -e "s%@SHARED_LIB@%$SHARED_LIB%" \
- $cf_dir/Makefile >$cf_dir/Makefile.out
- 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
-@@ -2936,8 +3369,23 @@
- cf_subdirs=
- for cf_item in $cf_LIST_MODELS
- do
-+
- echo "Appending rules for ${cf_item} model (${cf_dir}: ${cf_subset})"
- CF_UPPER(cf_ITEM,$cf_item)
-+
-+ CXX_MODEL=$cf_ITEM
-+ if test "$CXX_MODEL" = SHARED; then
-+ case $cf_cv_shlib_version in #(vi
-+ cygdll|msysdll|mingw) #(vi
-+ test "x$with_shared_cxx" = xno && CF_VERBOSE(overriding CXX_MODEL to SHARED)
-+ with_shared_cxx=yes
-+ ;;
-+ *)
-+ test "x$with_shared_cxx" = xno && CXX_MODEL=NORMAL
-+ ;;
-+ esac
-+ fi
-+
- CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)
- CF_OBJ_SUBDIR($cf_item,cf_subdir)
-
-@@ -2955,6 +3403,8 @@
- cf_libname=$TICS_LIB_SUFFIX
- ;;
- esac
-+ elif test $cf_dir = c++ ; then
-+ cf_libname=ncurses++$LIB_SUFFIX
- else
- cf_libname=${cf_libname}$LIB_SUFFIX
- fi
-@@ -3006,10 +3456,12 @@
- name=${cf_libname}${cf_dir_suffix} \
- traces=$LIB_TRACING \
- MODEL=$cf_ITEM \
-+ CXX_MODEL=$CXX_MODEL \
- model=$cf_subdir \
- prefix=$cf_prefix \
- suffix=$cf_suffix \
- subset=$cf_subset \
-+ driver=$cf_cv_term_driver \
- SymLink="$LN_S" \
- TermlibRoot=$TINFO_NAME \
- TermlibSuffix=$TINFO_SUFFIX \
-@@ -3048,7 +3500,7 @@
- done
- fi
-
-- echo ' cd '$cf_dir' && ${MAKE} ${CF_MFLAGS} [$]@' >>Makefile
-+ echo ' cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} [$]@' >>Makefile
- done
-
- for cf_dir in $SRC_SUBDIRS
-@@ -3063,7 +3515,7 @@
- echo 'libs \' >> Makefile
- echo 'install.libs \' >> Makefile
- echo 'uninstall.libs ::' >> Makefile
-- echo ' cd '$cf_dir' && ${MAKE} ${CF_MFLAGS} [$]@' >> Makefile
-+ echo ' cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} [$]@' >> Makefile
- ;;
- esac
- fi
-@@ -3086,7 +3538,7 @@
- uninstall.libs \\
- install.$cf_dir \\
- uninstall.$cf_dir ::
-- cd $cf_dir && \${MAKE} \${CF_MFLAGS} \[$]@
-+ cd $cf_dir && \${MAKE} \${TOP_MFLAGS} \[$]@
- CF_EOF
- elif test -f $srcdir/$cf_dir/headers; then
- cat >> Makefile <> Makefile <> Makefile <> Makefile </dev/null | fgrep -v "ing directory" | sed -e 's,[[ ]]*$,,'`
- case "$cf_result" in
-- .*k)
-+ .*k|.*kw)
- cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
- case "$cf_result" in
- .*CC=*) cf_cv_makeflags=
-@@ -3799,7 +4248,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: 43 updated: 2013/02/09 12:53:45
- 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 +4305,7 @@
- # this script is generated by the configure-script CF_MAN_PAGES macro.
-
- prefix="$cf_prefix"
-+datarootdir="$datarootdir"
- datadir="$datadir"
-
- NCURSES_MAJOR="$NCURSES_MAJOR"
-@@ -3916,11 +4366,12 @@
- if test ! -f $cf_man_alias ; then
- cat >>$cf_man_alias <<-CF_EOF2
- s,@DATADIR@,\$datadir,g
-- s,@TERMINFO@,\$TERMINFO,g
-- s,@NCURSES_MAJOR@,\$NCURSES_MAJOR,g
-- s,@NCURSES_MINOR@,\$NCURSES_MINOR,g
-- s,@NCURSES_PATCH@,\$NCURSES_PATCH,g
-- s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
-+ s,@TERMINFO@,\${TERMINFO:="no default value"},g
-+ s,@TERMINFO_DIRS@,\${TERMINFO_DIRS:="no default value"},g
-+ s,@NCURSES_MAJOR@,\${NCURSES_MAJOR:="no default value"},g
-+ s,@NCURSES_MINOR@,\${NCURSES_MINOR:="no default value"},g
-+ s,@NCURSES_PATCH@,\${NCURSES_PATCH:="no default value"},g
-+ s,@NCURSES_OSPEED@,\${NCURSES_OSPEED:="no default value"},g
- CF_EOF
- ifelse($1,,,[
- for cf_name in $1
-@@ -3949,7 +4400,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
-@@ -4154,7 +4614,7 @@
- fi
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_MIXEDCASE_FILENAMES version: 3 updated: 2003/09/20 17:07:55
-+dnl CF_MIXEDCASE_FILENAMES version: 6 updated: 2013/10/08 17:47:05
- dnl ----------------------
- dnl Check if the file-system supports mixed-case filenames. If we're able to
- dnl create a lowercase name and see it as uppercase, it doesn't support that.
-@@ -4163,7 +4623,7 @@
- AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
- if test "$cross_compiling" = yes ; then
- case $target_alias in #(vi
-- *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi
-+ *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) #(vi
- cf_cv_mixedcase=no
- ;;
- *)
-@@ -4181,10 +4641,10 @@
- rm -f conftest CONFTEST
- fi
- ])
--test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
-+test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37
-+dnl CF_MKSTEMP version: 9 updated: 2012/10/03 04:34:49
- 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,11 +4686,13 @@
- }
- ],[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)
-+ AC_DEFINE(HAVE_MKSTEMP,1,[Define to 1 if mkstemp() is available and working.])
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-@@ -4258,14 +4720,14 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_NO_LEAKS_OPTION version: 4 updated: 2006/12/16 14:24:05
-+dnl CF_NO_LEAKS_OPTION version: 5 updated: 2012/10/02 20:55:03
- dnl ------------------
- dnl see CF_WITH_NO_LEAKS
- AC_DEFUN([CF_NO_LEAKS_OPTION],[
- AC_MSG_CHECKING(if you want to use $1 for testing)
- AC_ARG_WITH($1,
- [$2],
-- [AC_DEFINE($3)ifelse([$4],,[
-+ [AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[
- $4
- ])
- : ${with_cflags:=-g}
-@@ -4306,7 +4768,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_OBJ_SUBDIR version: 4 updated: 2002/02/23 20:38:31
-+dnl CF_OBJ_SUBDIR version: 6 updated: 2013/09/07 14:06:10
- dnl -------------
- dnl Compute the object-directory name from the given model name
- AC_DEFUN([CF_OBJ_SUBDIR],
-@@ -4318,7 +4780,7 @@
- profile) $2='obj_p' ;;
- shared)
- case $cf_cv_system_name in #(vi
-- cygwin) #(vi
-+ cygwin|msys) #(vi
- $2='objects' ;;
- *)
- $2='obj_s' ;;
-@@ -4326,20 +4788,23 @@
- esac
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_PATHSEP version: 5 updated: 2010/05/26 05:38:42
-+dnl CF_PATHSEP version: 6 updated: 2012/09/29 18:38:12
- dnl ----------
--dnl Provide a value for the $PATH and similar separator
-+dnl Provide a value for the $PATH and similar separator (or amend the value
-+dnl as provided in autoconf 2.5x).
- AC_DEFUN([CF_PATHSEP],
- [
-+ AC_MSG_CHECKING(for PATH separator)
- case $cf_cv_system_name in
- os2*) PATH_SEPARATOR=';' ;;
-- *) PATH_SEPARATOR=':' ;;
-+ *) ${PATH_SEPARATOR:=':'} ;;
- esac
- ifelse([$1],,,[$1=$PATH_SEPARATOR])
- AC_SUBST(PATH_SEPARATOR)
-+ AC_MSG_RESULT($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 +4824,7 @@
- ;;
- .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX
- ;;
--.\[$]{*prefix}*) #(vi
-+.\[$]{*prefix}*|.\[$]{*dir}*) #(vi
- eval $1="[$]$1"
- case ".[$]$1" in #(vi
- .NONE/*)
-@@ -4376,7 +4841,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 +4858,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
-@@ -4554,6 +5021,19 @@
- test -z "$AWK" && AC_MSG_ERROR(No awk program found)
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_PROG_CC version: 4 updated: 2014/07/12 18:57:58
-+dnl ----------
-+dnl standard check for CC, plus followup sanity checks
-+dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
-+AC_DEFUN([CF_PROG_CC],[
-+ifelse($1,,[AC_PROG_CC],[AC_PROG_CC($1)])
-+CF_GCC_VERSION
-+CF_ACVERSION_CHECK(2.52,
-+ [AC_PROG_CC_STDC],
-+ [CF_ANSI_CC_REQD])
-+CF_CC_ENV_FLAGS
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_PROG_CC_C_O version: 3 updated: 2010/08/14 18:25:37
- dnl --------------
- dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that
-@@ -4593,31 +5073,6 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_PROG_CC_U_D version: 1 updated: 2005/07/14 16:59:30
--dnl --------------
--dnl Check if C (preprocessor) -U and -D options are processed in the order
--dnl given rather than by type of option. Some compilers insist on apply all
--dnl of the -U options after all of the -D options. Others allow mixing them,
--dnl and may predefine symbols that conflict with those we define.
--AC_DEFUN([CF_PROG_CC_U_D],
--[
--AC_CACHE_CHECK(if $CC -U and -D options work together,cf_cv_cc_u_d_options,[
-- cf_save_CPPFLAGS="$CPPFLAGS"
-- CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
-- AC_TRY_COMPILE([],[
--#ifndef U_D_OPTIONS
--make an undefined-error
--#endif
--#ifdef D_U_OPTIONS
--make a defined-error
--#endif
-- ],[
-- cf_cv_cc_u_d_options=yes],[
-- cf_cv_cc_u_d_options=no])
-- CPPFLAGS="$cf_save_CPPFLAGS"
--])
--])dnl
--dnl ---------------------------------------------------------------------------
- dnl CF_PROG_EGREP version: 1 updated: 2006/09/16 11:40:59
- dnl -------------
- dnl AC_PROG_EGREP was introduced in autoconf 2.53.
-@@ -4633,32 +5088,7 @@
- test -z "$EGREP" && AC_MSG_ERROR(No egrep program found)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_PROG_EXT version: 10 updated: 2004/01/03 19:28:18
--dnl -----------
--dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX.
--AC_DEFUN([CF_PROG_EXT],
--[
--AC_REQUIRE([CF_CHECK_CACHE])
--case $cf_cv_system_name in
--os2*)
-- CFLAGS="$CFLAGS -Zmt"
-- CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__"
-- CXXFLAGS="$CXXFLAGS -Zmt"
-- # autoconf's macro sets -Zexe and suffix both, which conflict:w
-- LDFLAGS="$LDFLAGS -Zmt -Zcrtdll"
-- ac_cv_exeext=.exe
-- ;;
--esac
--
--AC_EXEEXT
--AC_OBJEXT
--
--PROG_EXT="$EXEEXT"
--AC_SUBST(PROG_EXT)
--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 +5096,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 +5140,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 +5149,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 +5190,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: 10 updated: 2012/10/04 20:12:20
- dnl --------
- dnl Attempt to determine if we've got one of the flavors of regular-expression
- dnl code that we can support.
-@@ -4771,7 +5202,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
-
-@@ -4833,9 +5264,9 @@
-
- case $cf_cv_regex_hdrs in #(vi
- no) AC_MSG_WARN(no regular expression header found) ;; #(vi
-- regex.h) AC_DEFINE(HAVE_REGEX_H_FUNCS) ;; #(vi
-- regexp.h) AC_DEFINE(HAVE_REGEXP_H_FUNCS) ;; #(vi
-- regexpr.h) AC_DEFINE(HAVE_REGEXPR_H_FUNCS) ;;
-+ regex.h) AC_DEFINE(HAVE_REGEX_H_FUNCS,1,[Define to 1 to include regex.h for regular expressions]) ;; #(vi
-+ regexp.h) AC_DEFINE(HAVE_REGEXP_H_FUNCS,1,[Define to 1 to include regexp.h for regular expressions]) ;; #(vi
-+ regexpr.h) AC_DEFINE(HAVE_REGEXPR_H_FUNCS,1,[Define to 1 to include regexpr.h for regular expressions]) ;;
- esac
- ])dnl
- dnl ---------------------------------------------------------------------------
-@@ -4869,7 +5300,7 @@
- $1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'`
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_RPATH_HACK version: 9 updated: 2011/02/13 13:31:33
-+dnl CF_RPATH_HACK version: 11 updated: 2013/09/01 13:02:00
- dnl -------------
- AC_DEFUN([CF_RPATH_HACK],
- [
-@@ -4886,8 +5317,8 @@
-
- AC_TRY_LINK([#include ],
- [printf("Hello");],
-- [cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u`
-- cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`])
-+ [cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
-+ cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort | uniq`])
-
- # If we passed the link-test, but get a "not found" on a given library,
- # this could be due to inept reconfiguration of gcc to make it only
-@@ -4920,6 +5351,8 @@
- CF_RPATH_HACK_2(LIBS)
-
- CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
-+else
-+ AC_MSG_RESULT(no)
- fi
- AC_SUBST(EXTRA_LDFLAGS)
- ])dnl
-@@ -4984,18 +5417,19 @@
- AC_SUBST(EXTRA_LDFLAGS)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_SHARED_OPTS version: 64 updated: 2010/06/05 16:51:16
-+dnl CF_SHARED_OPTS version: 84 updated: 2013/11/03 06:26:10
- dnl --------------
- dnl --------------
- dnl Attempt to determine the appropriate CC/LD options for creating a shared
- dnl library.
- dnl
--dnl Note: ${LOCAL_LDFLAGS} is used to link executables that will run within the
--dnl build-tree, i.e., by making use of the libraries that are compiled in ../lib
--dnl We avoid compiling-in a ../lib path for the shared library since that can
--dnl lead to unexpected results at runtime.
--dnl ${LOCAL_LDFLAGS2} has the same intention but assumes that the shared libraries
--dnl are compiled in ../../lib
-+dnl Notes:
-+dnl a) ${LOCAL_LDFLAGS} is used to link executables that will run within
-+dnl the build-tree, i.e., by making use of the libraries that are compiled in
-+dnl $rel_builddir/lib We avoid compiling-in a $rel_builddir/lib path for the
-+dnl shared library since that can lead to unexpected results at runtime.
-+dnl b) ${LOCAL_LDFLAGS2} has the same intention but assumes that the shared
-+dnl libraries are compiled in ../../lib
- dnl
- dnl The variable 'cf_cv_do_symlinks' is used to control whether we configure
- dnl to install symbolic links to the rel/abi versions of shared libraries.
-@@ -5010,12 +5444,19 @@
- dnl Some loaders leave 'so_locations' lying around. It's nice to clean up.
- AC_DEFUN([CF_SHARED_OPTS],
- [
-- AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
- AC_REQUIRE([CF_LD_RPATH_OPT])
-+ RM_SHARED_OPTS=
- LOCAL_LDFLAGS=
- LOCAL_LDFLAGS2=
- LD_SHARED_OPTS=
- INSTALL_LIB="-m 644"
-+ : ${rel_builddir:=.}
-+
-+ shlibdir=$libdir
-+ AC_SUBST(shlibdir)
-+
-+ MAKE_DLLS="#"
-+ AC_SUBST(MAKE_DLLS)
-
- cf_cv_do_symlinks=no
- cf_ld_rpath_opt=
-@@ -5040,6 +5481,7 @@
- AC_MSG_RESULT($cf_cv_shlib_version)
-
- cf_cv_rm_so_locs=no
-+ cf_try_cflags=
-
- # Some less-capable ports of gcc support only -fpic
- CC_SHARED_OPTS=
-@@ -5059,10 +5501,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
-@@ -5070,9 +5516,12 @@
- ;;
- cygwin*) #(vi
- CC_SHARED_OPTS=
-- MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
-+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
-+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
- cf_cv_shlib_version=cygdll
- cf_cv_shlib_version_infix=cygdll
-+ shlibdir=$bindir
-+ MAKE_DLLS=
- cat >mk_shared_lib.sh <<-CF_EOF
- #!/bin/sh
- SHARED_LIB=\[$]1
-@@ -5083,12 +5532,34 @@
- ** 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}
-+ exec \[$]* -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
-+CF_EOF
-+ chmod +x mk_shared_lib.sh
-+ ;;
-+ msys*) #(vi
-+ CC_SHARED_OPTS=
-+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
-+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
-+ cf_cv_shlib_version=msysdll
-+ cf_cv_shlib_version_infix=msysdll
-+ shlibdir=$bindir
-+ MAKE_DLLS=
-+ cat >mk_shared_lib.sh <<-CF_EOF
-+ #!/bin/sh
-+ SHARED_LIB=\[$]1
-+ IMPORT_LIB=\`echo "\[$]1" | sed -e 's/msys-/lib/' -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=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
- CF_EOF
- chmod +x mk_shared_lib.sh
- ;;
- darwin*) #(vi
-- EXTRA_CFLAGS="-no-cpp-precomp"
-+ cf_try_cflags="no-cpp-precomp"
- CC_SHARED_OPTS="-dynamic"
- 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
-@@ -5102,6 +5573,14 @@
- LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- fi
- ;;
-+ hpux[[7-8]]*) #(vi
-+ # HP-UX 8.07 ld lacks "+b" option used for libdir search-list
-+ if test "$GCC" != yes; then
-+ CC_SHARED_OPTS='+Z'
-+ fi
-+ MK_SHARED_LIB='${LD} -b -o $[@]'
-+ INSTALL_LIB="-m 555"
-+ ;;
- hpux*) #(vi
- # (tested with gcc 2.7.2 -- I don't have c89)
- if test "$GCC" = yes; then
-@@ -5115,9 +5594,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 +5623,45 @@
- 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
-+ shlibdir=$bindir
-+ MAKE_DLLS=
-+ if test "$DFT_LWR_MODEL" = "shared" ; then
-+ LOCAL_LDFLAGS="-Wl,--enable-auto-import"
-+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
-+ EXTRA_LDFLAGS="-Wl,--enable-auto-import $EXTRA_LDFLAGS"
-+ fi
-+ CC_SHARED_OPTS=
-+ MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
-+ RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
-+ 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,--enable-auto-import,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{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 +5672,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 +5687,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
-@@ -5182,7 +5698,7 @@
- CF_SHARED_SONAME
- MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
- else
-- MK_SHARED_LIB='${LD} -shared -Bshareable -o $[@]'
-+ MK_SHARED_LIB='${CC} -Wl,-shared -Wl,-Bshareable -o $[@]'
- fi
- ;;
- osf*|mls+*) #(vi
-@@ -5276,20 +5792,57 @@
- ;;
- esac
-
-- if test -n "$cf_ld_rpath_opt" ; then
-- MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
-+ if test -n "$cf_try_cflags"
-+ then
-+cat > conftest.$ac_ext <
-+int main(int argc, char *argv[[]])
-+{
-+ printf("hello\n");
-+ return (argv[[argc-1]] == 0) ;
-+}
-+EOF
-+ cf_save_CFLAGS="$CFLAGS"
-+ for cf_opt in $cf_try_cflags
-+ do
-+ CFLAGS="$cf_save_CFLAGS -$cf_opt"
-+ AC_MSG_CHECKING(if CFLAGS option -$cf_opt works)
-+ if AC_TRY_EVAL(ac_compile); then
-+ AC_MSG_RESULT(yes)
-+ cf_save_CFLAGS="$CFLAGS"
-+ else
-+ AC_MSG_RESULT(no)
-+ fi
-+ done
-+ CFLAGS="$cf_save_CFLAGS"
- 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 $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations"
-+
-+ 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)
- AC_SUBST(LD_SHARED_OPTS)
- AC_SUBST(MK_SHARED_LIB)
-+ AC_SUBST(RM_SHARED_OPTS)
-+
- AC_SUBST(LINK_PROGS)
- AC_SUBST(LINK_TESTS)
-+
- AC_SUBST(EXTRA_LDFLAGS)
- 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
-@@ -5369,7 +5922,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_SIG_ATOMIC_T version: 2 updated: 2005/09/18 17:27:12
-+dnl CF_SIG_ATOMIC_T version: 3 updated: 2012/10/04 20:12:20
- dnl ---------------
- dnl signal handler, but there are some gcc depedencies in that recommendation.
- dnl Try anyway.
-@@ -5401,10 +5954,10 @@
- done
- ])
- AC_MSG_RESULT($cf_cv_sig_atomic_t)
--test "$cf_cv_sig_atomic_t" != no && AC_DEFINE_UNQUOTED(SIG_ATOMIC_T, $cf_cv_sig_atomic_t)
-+test "$cf_cv_sig_atomic_t" != no && AC_DEFINE_UNQUOTED(SIG_ATOMIC_T, $cf_cv_sig_atomic_t,[Define to signal global datatype])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_SIZECHANGE version: 8 updated: 2000/11/04 12:22:16
-+dnl CF_SIZECHANGE version: 9 updated: 2012/10/06 11:17:15
- dnl -------------
- dnl Check for definitions & structures needed for window size-changing
- dnl FIXME: check that this works with "snake" (HP-UX 10.x)
-@@ -5465,7 +6018,7 @@
- done
- ])
- if test "$cf_cv_sizechange" != no ; then
-- AC_DEFINE(HAVE_SIZECHANGE)
-+ AC_DEFINE(HAVE_SIZECHANGE,1,[Define to 1 if sizechar declarations are provided])
- case $cf_cv_sizechange in #(vi
- NEED*)
- AC_DEFINE_UNQUOTED($cf_cv_sizechange )
-@@ -5474,7 +6027,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_SRC_MODULES version: 21 updated: 2010/09/04 17:37:40
-+dnl CF_SRC_MODULES version: 28 updated: 2014/09/20 20:16:32
- 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 +6050,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 +6089,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
-@@ -5561,11 +6116,20 @@
- if test "x$cf_with_tests" != "xno" ; then
- 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++"
-+# always make this, to install the ncurses-config script
-+SRC_SUBDIRS="$SRC_SUBDIRS misc"
-+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 +6188,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: 5 updated: 2012/10/06 17:56:13
- 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 +6209,24 @@
- #include ],
- [struct sigaction act],
- [sigact_bad=yes
-- AC_DEFINE(SVR4_ACTION)],
-+ AC_DEFINE(_POSIX_SOURCE,1,[Define to 1 if we must 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: 7 updated: 2012/10/06 17:56:13
- 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,14 +6246,14 @@
- #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,1,[Define to 1 if we must define _POSIX_SOURCE]))
- ])
- AC_MSG_RESULT($termios_bad)
- fi
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_SUBDIR_PATH version: 6 updated: 2010/04/21 06:20:50
-+dnl CF_SUBDIR_PATH version: 7 updated: 2014/12/04 04:33:06
- dnl --------------
- dnl Construct a search-list for a nonstandard header/lib-file
- dnl $1 = the variable to return as result
-@@ -5697,28 +6263,18 @@
- [
- $1=
-
--CF_ADD_SUBDIR_PATH($1,$2,$3,/usr,$prefix)
- CF_ADD_SUBDIR_PATH($1,$2,$3,$prefix,NONE)
--CF_ADD_SUBDIR_PATH($1,$2,$3,/usr/local,$prefix)
--CF_ADD_SUBDIR_PATH($1,$2,$3,/opt,$prefix)
--CF_ADD_SUBDIR_PATH($1,$2,$3,[$]HOME,$prefix)
--])dnl
--dnl ---------------------------------------------------------------------------
--dnl CF_SUBST version: 4 updated: 2006/06/17 12:33:03
--dnl --------
--dnl Shorthand macro for substituting things that the user may override
--dnl with an environment variable.
--dnl
--dnl $1 = long/descriptive name
--dnl $2 = environment variable
--dnl $3 = default value
--AC_DEFUN([CF_SUBST],
--[AC_CACHE_VAL(cf_cv_subst_$2,[
--AC_MSG_CHECKING(for $1 (symbol $2))
--CF_SUBST_IF([-z "[$]$2"], [$2], [$3])
--cf_cv_subst_$2=[$]$2
--AC_MSG_RESULT([$]$2)
--])
-+
-+for cf_subdir_prefix in \
-+ /usr \
-+ /usr/local \
-+ /usr/pkg \
-+ /opt \
-+ /opt/local \
-+ [$]HOME
-+do
-+ CF_ADD_SUBDIR_PATH($1,$2,$3,$cf_subdir_prefix,$prefix)
-+done
- ])dnl
- dnl ---------------------------------------------------------------------------
- dnl CF_SUBST_IF version: 2 updated: 2006/06/17 12:33:03
-@@ -5766,7 +6322,7 @@
- AC_SUBST(cf_cv_type_of_bool)dnl
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_SYS_TIME_SELECT version: 4 updated: 2000/10/04 09:18:40
-+dnl CF_SYS_TIME_SELECT version: 5 updated: 2012/10/04 05:24:07
- dnl ------------------
- dnl Check if we can include with ; this breaks on
- dnl older SCO configurations.
-@@ -5786,19 +6342,58 @@
- [cf_cv_sys_time_select=no])
- ])
- AC_MSG_RESULT($cf_cv_sys_time_select)
--test "$cf_cv_sys_time_select" = yes && AC_DEFINE(HAVE_SYS_TIME_SELECT)
-+test "$cf_cv_sys_time_select" = yes && AC_DEFINE(HAVE_SYS_TIME_SELECT,1,[Define to 1 if we can include with ])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_TOP_BUILDDIR version: 1 updated: 2006/10/15 16:33:23
-+dnl CF_TOP_BUILDDIR version: 2 updated: 2013/07/27 17:38:32
- dnl ---------------
- dnl Define a top_builddir symbol, for applications that need an absolute path.
- AC_DEFUN([CF_TOP_BUILDDIR],
- [
--top_builddir=`pwd`
-+top_builddir=ifelse($1,,`pwd`,$1)
- AC_SUBST(top_builddir)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_TYPEOF_CHTYPE version: 8 updated: 2006/12/16 12:33:30
-+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: 9 updated: 2012/10/06 17:56:13
- dnl ----------------
- dnl Determine the type we should use for chtype (and attr_t, which is treated
- dnl as the same thing). We want around 32 bits, so on most machines want a
-@@ -5847,10 +6442,10 @@
- AC_MSG_RESULT($cf_cv_typeof_chtype)
-
- AC_SUBST(cf_cv_typeof_chtype)
--AC_DEFINE_UNQUOTED(TYPEOF_CHTYPE,$cf_cv_typeof_chtype)
-+AC_DEFINE_UNQUOTED(TYPEOF_CHTYPE,$cf_cv_typeof_chtype,[Define to actual type if needed for chtype])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_TYPE_SIGACTION version: 3 updated: 2000/08/12 23:18:52
-+dnl CF_TYPE_SIGACTION version: 4 updated: 2012/10/06 17:56:13
- dnl -----------------
- dnl
- AC_DEFUN([CF_TYPE_SIGACTION],
-@@ -5863,7 +6458,7 @@
- [cf_cv_type_sigaction=yes],
- [cf_cv_type_sigaction=no])])
- AC_MSG_RESULT($cf_cv_type_sigaction)
--test "$cf_cv_type_sigaction" = yes && AC_DEFINE(HAVE_TYPE_SIGACTION)
-+test "$cf_cv_type_sigaction" = yes && AC_DEFINE(HAVE_TYPE_SIGACTION,1,[Define to 1 if we have the sigaction_t type])
- ])dnl
- dnl ---------------------------------------------------------------------------
- dnl CF_UNSIGNED_LITERALS version: 2 updated: 1998/02/07 22:10:16
-@@ -5890,7 +6485,7 @@
- $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_UTF8_LIB version: 7 updated: 2010/06/20 09:24:28
-+dnl CF_UTF8_LIB version: 8 updated: 2012/10/06 08:57:51
- dnl -----------
- dnl Check for multibyte support, and if not found, utf8 compatibility library
- AC_DEFUN([CF_UTF8_LIB],
-@@ -5909,14 +6504,14 @@
- # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
- # ncurses/ncursesw:
- if test "$cf_cv_utf8_lib" = "add-on" ; then
-- AC_DEFINE(HAVE_LIBUTF8_H)
-+ AC_DEFINE(HAVE_LIBUTF8_H,1,[Define to 1 if we should include libutf8.h])
- CF_ADD_INCDIR($cf_cv_header_path_utf8)
- CF_ADD_LIBDIR($cf_cv_library_path_utf8)
- CF_ADD_LIBS($cf_cv_library_file_utf8)
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_VA_COPY version: 2 updated: 2010/03/04 05:37:29
-+dnl CF_VA_COPY version: 3 updated: 2012/10/06 11:17:15
- dnl ----------
- dnl check for va_copy, part of stdarg.h
- dnl Also, workaround for glibc's __va_copy, by checking for both.
-@@ -5931,7 +6526,7 @@
- cf_cv_have_va_copy=yes,
- cf_cv_have_va_copy=no)])
-
--test "$cf_cv_have_va_copy" = yes && AC_DEFINE(HAVE_VA_COPY)
-+test "$cf_cv_have_va_copy" = yes && AC_DEFINE(HAVE_VA_COPY,1,[Define to 1 if we have va_copy])
-
- AC_CACHE_CHECK(for __va_copy, cf_cv_have___va_copy,[
- AC_TRY_LINK([
-@@ -5943,7 +6538,7 @@
- cf_cv_have___va_copy=yes,
- cf_cv_have___va_copy=no)])
-
--test "$cf_cv_have___va_copy" = yes && AC_DEFINE(HAVE___VA_COPY)
-+test "$cf_cv_have___va_copy" = yes && AC_DEFINE(HAVE___VA_COPY,1,[Define to 1 if we have __va_copy])
- ])
- dnl ---------------------------------------------------------------------------
- dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12
-@@ -5954,7 +6549,95 @@
- CF_MSG_LOG([$1])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_WCHAR_TYPE version: 3 updated: 2010/05/26 16:44:57
-+dnl CF_VERSION_INFO version: 6 updated: 2013/06/16 10:25:53
-+dnl ---------------
-+dnl Define several useful symbols derived from the VERSION file. A separate
-+dnl file is preferred to embedding the version numbers in various scripts.
-+dnl (automake is a textbook-example of why the latter is a bad idea, but there
-+dnl are others).
-+dnl
-+dnl The file contents are:
-+dnl libtool-version release-version patch-version
-+dnl or
-+dnl release-version
-+dnl where
-+dnl libtool-version (see ?) consists of 3 integers separated by '.'
-+dnl release-version consists of a major version and minor version
-+dnl separated by '.', optionally followed by a patch-version
-+dnl separated by '-'. The minor version need not be an
-+dnl integer (but it is preferred).
-+dnl patch-version is an integer in the form yyyymmdd, so ifdef's and
-+dnl scripts can easily compare versions.
-+dnl
-+dnl If libtool is used, the first form is required, since CF_WITH_LIBTOOL
-+dnl simply extracts the first field using 'cut -f1'.
-+dnl
-+dnl Optional parameters:
-+dnl $1 = internal name for package
-+dnl $2 = external name for package
-+AC_DEFUN([CF_VERSION_INFO],
-+[
-+if test -f $srcdir/VERSION ; then
-+ AC_MSG_CHECKING(for package version)
-+
-+ # if there are not enough fields, cut returns the last one...
-+ cf_field1=`sed -e '2,$d' $srcdir/VERSION|cut -f1`
-+ cf_field2=`sed -e '2,$d' $srcdir/VERSION|cut -f2`
-+ cf_field3=`sed -e '2,$d' $srcdir/VERSION|cut -f3`
-+
-+ # this is how CF_BUNDLED_INTL uses $VERSION:
-+ VERSION="$cf_field1"
-+
-+ VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
-+ test -z "$VERSION_MAJOR" && AC_MSG_ERROR(missing major-version)
-+
-+ VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[[^.]]*\.//' -e 's/-.*//'`
-+ test -z "$VERSION_MINOR" && AC_MSG_ERROR(missing minor-version)
-+
-+ AC_MSG_RESULT(${VERSION_MAJOR}.${VERSION_MINOR})
-+
-+ AC_MSG_CHECKING(for package patch date)
-+ VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[[^-]]*-//'`
-+ case .$VERSION_PATCH in
-+ .)
-+ AC_MSG_ERROR(missing patch-date $VERSION_PATCH)
-+ ;;
-+ .[[0-9]][[0-9]][[0-9]][[0-9]][[0-9]][[0-9]][[0-9]][[0-9]])
-+ ;;
-+ *)
-+ AC_MSG_ERROR(illegal patch-date $VERSION_PATCH)
-+ ;;
-+ esac
-+ AC_MSG_RESULT($VERSION_PATCH)
-+else
-+ AC_MSG_ERROR(did not find $srcdir/VERSION)
-+fi
-+
-+# show the actual data that we have for versions:
-+CF_VERBOSE(ABI VERSION $VERSION)
-+CF_VERBOSE(VERSION_MAJOR $VERSION_MAJOR)
-+CF_VERBOSE(VERSION_MINOR $VERSION_MINOR)
-+CF_VERBOSE(VERSION_PATCH $VERSION_PATCH)
-+
-+AC_SUBST(VERSION)
-+AC_SUBST(VERSION_MAJOR)
-+AC_SUBST(VERSION_MINOR)
-+AC_SUBST(VERSION_PATCH)
-+
-+dnl if a package name is given, define its corresponding version info. We
-+dnl need the package name to ensure that the defined symbols are unique.
-+ifelse($1,,,[
-+ cf_PACKAGE=$1
-+ PACKAGE=ifelse($2,,$1,$2)
-+ AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE",[Define to the package-name])
-+ AC_SUBST(PACKAGE)
-+ CF_UPPER(cf_PACKAGE,$cf_PACKAGE)
-+ AC_DEFINE_UNQUOTED(${cf_PACKAGE}_VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}")
-+ AC_DEFINE_UNQUOTED(${cf_PACKAGE}_PATCHDATE,${VERSION_PATCH})
-+])
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_WCHAR_TYPE version: 4 updated: 2012/10/06 16:39:58
- dnl -------------
- dnl Check if type wide-character type $1 is declared, and if so, which header
- dnl file is needed. The second parameter is used to set a shell variable when
-@@ -5986,7 +6669,7 @@
- [cf_cv_$1=unknown])])])
-
- if test "$cf_cv_$1" = yes ; then
-- AC_DEFINE(NEED_WCHAR_H)
-+ AC_DEFINE(NEED_WCHAR_H,1,[Define to 1 if we must include wchar.h])
- NEED_WCHAR_H=1
- fi
-
-@@ -6091,14 +6774,14 @@
- AC_MSG_RESULT($ADA_OBJECTS)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_ADA_SHAREDLIB version: 2 updated: 2010/06/26 17:35:58
-+dnl CF_WITH_ADA_SHAREDLIB version: 4 updated: 2014/05/31 21:08:37
- dnl ---------------------
- dnl Command-line option to specify if an Ada95 shared-library should be built,
- dnl and optionally what its soname should be.
- AC_DEFUN([CF_WITH_ADA_SHAREDLIB],[
- AC_MSG_CHECKING(if an Ada95 shared-library should be built)
- AC_ARG_WITH(ada-sharedlib,
-- [ --with-ada-sharedlib=XX build Ada95 shared-library],
-+ [ --with-ada-sharedlib=soname build shared-library (requires GNAT projects)],
- [with_ada_sharedlib=$withval],
- [with_ada_sharedlib=no])
- AC_MSG_RESULT($with_ada_sharedlib)
-@@ -6149,7 +6832,33 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_GPM version: 7 updated: 2008/03/23 14:48:54
-+dnl CF_WITH_EXPORT_SYMS version: 2 updated: 2014/11/15 19:05:29
-+dnl -------------------
-+dnl Use this with libtool to specify the list of symbols that may be exported.
-+dnl The input file contains one symbol per line; comments work with "#".
-+dnl
-+dnl $1 = basename of the ".sym" file (default $PACKAGE)
-+AC_DEFUN([CF_WITH_EXPORT_SYMS],
-+[
-+AC_MSG_CHECKING(if exported-symbols file should be used)
-+AC_ARG_WITH(export-syms,
-+ [ --with-export-syms=XXX limit exported symbols using libtool],
-+ [with_export_syms=$withval],
-+ [with_export_syms=no])
-+if test "x$with_export_syms" = xyes
-+then
-+ with_export_syms='${top_srcdir}/package/ifelse($1,,${PACKAGE},[$1]).sym'
-+ AC_SUBST(PACKAGE)
-+fi
-+AC_MSG_RESULT($with_export_syms)
-+if test "x$with_export_syms" != xno
-+then
-+ EXPORT_SYMS="$EXPORT_SYMS -export-symbols $with_export_syms"
-+ AC_SUBST(EXPORT_SYMS)
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_WITH_GPM version: 8 updated: 2012/10/06 17:56:13
- dnl -----------
- dnl
- dnl The option parameter (if neither yes/no) is assumed to be the name of
-@@ -6165,10 +6874,10 @@
-
- if test "$with_gpm" != no ; then
- AC_CHECK_HEADER(gpm.h,[
-- AC_DEFINE(HAVE_GPM_H)
-+ AC_DEFINE(HAVE_GPM_H,1,[Define to 1 if we have gpm.h header])
- if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
- CF_VERBOSE(assuming we really have GPM library)
-- AC_DEFINE(HAVE_LIBGPM)
-+ AC_DEFINE(HAVE_LIBGPM,1,[Define to 1 if we have the gpm library])
- else
- AC_CHECK_LIB(gpm,Gpm_Open,[:],[
- AC_MSG_ERROR(Cannot link with GPM library)
-@@ -6182,7 +6891,7 @@
- fi
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_LIBTOOL version: 26 updated: 2010/10/23 15:55:24
-+dnl CF_WITH_LIBTOOL version: 31 updated: 2014/11/15 19:05:29
- dnl ---------------
- dnl Provide a configure option to incorporate libtool. Define several useful
- dnl symbols for the makefile rules.
-@@ -6252,13 +6961,20 @@
- CF_PATH_SYNTAX(with_libtool)
- LIBTOOL=$with_libtool
- else
-- AC_PATH_PROG(LIBTOOL,libtool)
-+ AC_CHECK_TOOLS(LIBTOOL,[libtool glibtool],none)
-+ CF_LIBTOOL_VERSION
-+ if test -z "$cf_cv_libtool_version" && test "$LIBTOOL" = libtool
-+ then
-+ CF_FORGET_TOOL(LIBTOOL)
-+ AC_CHECK_TOOLS(LIBTOOL,[glibtool],none)
-+ CF_LIBTOOL_VERSION
-+ fi
- fi
- if test -z "$LIBTOOL" ; then
- 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 ${top_srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
- LIB_OBJECT='${OBJECTS:.o=.lo}'
- LIB_SUFFIX=.la
- LIB_CLEAN='${LIBTOOL} --mode=clean'
-@@ -6268,22 +6984,12 @@
- LIB_UNINSTALL='${LIBTOOL} --mode=uninstall'
- LIB_PREP=:
-
-- # Show the version of libtool
-- AC_MSG_CHECKING(version of libtool)
--
-- # Save the version in a cache variable - this is not entirely a good
-- # thing, but the version string from libtool is very ugly, and for
-- # bug reports it might be useful to have the original string. "("
-- cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
-- AC_MSG_RESULT($cf_cv_libtool_version)
-- if test -z "$cf_cv_libtool_version" ; then
-- AC_MSG_ERROR(This is not GNU libtool)
-- fi
-+ CF_CHECK_LIBTOOL_VERSION
-
- # 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*|msys*|mingw32*|uwin*|aix[[4-7]]) #(vi
- LT_UNDEF=-no-undefined
- ;;
- esac
-@@ -6323,7 +7029,59 @@
-
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_PATH version: 10 updated: 2010/10/23 15:44:18
-+dnl CF_WITH_LIBTOOL_OPTS version: 3 updated: 2014/11/02 16:11:49
-+dnl --------------------
-+dnl Allow user to pass additional libtool options into the library creation
-+dnl and link steps. The main use for this is to do something like
-+dnl ./configure --with-libtool-opts=-static
-+dnl to get the same behavior as automake-flavored
-+dnl ./configure --enable-static
-+AC_DEFUN([CF_WITH_LIBTOOL_OPTS],[
-+AC_MSG_CHECKING(for additional libtool options)
-+AC_ARG_WITH(libtool-opts,
-+ [ --with-libtool-opts=XXX specify additional libtool options],
-+ [with_libtool_opts=$withval],
-+ [with_libtool_opts=no])
-+AC_MSG_RESULT($with_libtool_opts)
-+
-+case .$with_libtool_opts in
-+.yes|.no|.)
-+ ;;
-+*)
-+ LIBTOOL_OPTS="$LIBTOOL_OPTS $with_libtool_opts"
-+ ;;
-+esac
-+
-+AC_SUBST(LIBTOOL_OPTS)
-+])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: 11 updated: 2012/09/29 15:04:19
- dnl ------------
- dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
- dnl defaulting to yes/no.
-@@ -6340,11 +7098,11 @@
- if ifelse([$5],,true,[test -n "$5"]) ; then
- CF_PATH_SYNTAX(withval)
- fi
--$3="$withval"
-+eval $3="$withval"
- AC_SUBST($3)dnl
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_PATHLIST version: 7 updated: 2010/10/23 16:10:30
-+dnl CF_WITH_PATHLIST version: 9 updated: 2012/10/18 05:05:24
- dnl ----------------
- dnl Process an option specifying a list of colon-separated paths.
- dnl
-@@ -6365,7 +7123,7 @@
- for cf_src_path in $withval
- do
- CF_PATH_SYNTAX(cf_src_path)
-- test -n "$cf_dst_path" && cf_dst_path="${cf_dst_path}:"
-+ test -n "$cf_dst_path" && cf_dst_path="${cf_dst_path}$PATH_SEPARATOR"
- cf_dst_path="${cf_dst_path}${cf_src_path}"
- done
- IFS="$ac_save_ifs"
-@@ -6381,12 +7139,65 @@
- cf_dst_path=`echo "$cf_dst_path" | sed -e 's/\\\\/\\\\\\\\/g'`
- ])
-
--eval '$3="$cf_dst_path"'
-+# This may use the prefix/exec_prefix symbols which will only yield "NONE"
-+# so we have to check/work around. We do prefer the result of "eval"...
-+eval cf_dst_eval="$cf_dst_path"
-+case "x$cf_dst_eval" in #(vi
-+xNONE*) #(vi
-+ $3=$cf_dst_path
-+ ;;
-+*)
-+ $3="$cf_dst_eval"
-+ ;;
-+esac
- 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: 6 updated: 2012/10/06 17:41:51
- dnl ---------------
- dnl Check for POSIX thread library.
- AC_DEFUN([CF_WITH_PTHREAD],
-@@ -6400,25 +7211,30 @@
-
- if test "$with_pthread" != no ; then
- AC_CHECK_HEADER(pthread.h,[
-- AC_DEFINE(HAVE_PTHREADS_H)
-+ AC_DEFINE(HAVE_PTHREADS_H,1,[Define to 1 if we have pthreads.h header])
-
-- 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,1,[Define to 1 if we have pthreads library])
-+ else
-+ AC_MSG_ERROR(Cannot link with pthread library)
-+ fi
- ])
- fi
- ])
-@@ -6448,7 +7264,7 @@
- ])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_SYSMOUSE version: 2 updated: 2003/03/22 19:13:43
-+dnl CF_WITH_SYSMOUSE version: 3 updated: 2012/10/06 17:56:13
- dnl ----------------
- dnl If we can compile with sysmouse, make it available unless it is not wanted.
- AC_DEFUN([CF_WITH_SYSMOUSE],[
-@@ -6474,10 +7290,30 @@
- ],[cf_with_sysmouse=yes],[cf_with_sysmouse=no])
- fi
- AC_MSG_RESULT($cf_with_sysmouse)
--test "$cf_with_sysmouse" = yes && AC_DEFINE(USE_SYSMOUSE)
-+test "$cf_with_sysmouse" = yes && AC_DEFINE(USE_SYSMOUSE,1,[Define to 1 if we can/should use the sysmouse interface])
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_WITH_SYSTYPE version: 1 updated: 2013/01/26 16:26:12
-+dnl ---------------
-+dnl For testing, override the derived host system-type which is used to decide
-+dnl things such as the linker commands used to build shared libraries. This is
-+dnl normally chosen automatically based on the type of system which you are
-+dnl building on. We use it for testing the configure script.
-+dnl
-+dnl This is different from the --host option: it is used only for testing parts
-+dnl of the configure script which would not be reachable with --host since that
-+dnl relies on the build environment being real, rather than mocked up.
-+AC_DEFUN([CF_WITH_SYSTYPE],[
-+CF_CHECK_CACHE([AC_CANONICAL_SYSTEM])
-+AC_ARG_WITH(system-type,
-+ [ --with-system-type=XXX test: override derived host system-type],
-+[AC_MSG_WARN(overriding system type to $withval)
-+ cf_cv_system_name=$withval
-+ host_os=$withval
-+])
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21
- dnl ----------------
- AC_DEFUN([CF_WITH_VALGRIND],[
-@@ -6486,7 +7322,49 @@
- [USE_VALGRIND])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37
-+dnl CF_WITH_VERSIONED_SYMS version: 2 updated: 2014/11/15 19:05:29
-+dnl ----------------------
-+dnl Use this when building shared library with ELF, to markup symbols with the
-+dnl version identifier from the given input file. Generally that identifier is
-+dnl the same as the SONAME at which the symbol was first introduced.
-+dnl
-+dnl $1 = basename of the ".sym" file (default $PACKAGE)
-+AC_DEFUN([CF_WITH_VERSIONED_SYMS],
-+[
-+AC_MSG_CHECKING(if versioned-symbols file should be used)
-+AC_ARG_WITH(versioned-syms,
-+ [ --with-versioned-syms=X markup versioned symbols using ld],
-+ [with_versioned_syms=$withval],
-+ [with_versioned_syms=no])
-+if test "x$with_versioned_syms" = xyes
-+then
-+ with_versioned_syms='${top_srcdir}/package/ifelse($1,,${PACKAGE},[$1]).map'
-+ AC_SUBST(PACKAGE)
-+fi
-+AC_MSG_RESULT($with_versioned_syms)
-+
-+if test "x$with_versioned_syms" != xno
-+then
-+ AC_SUBST(VERSIONED_SYMS)
-+ case "x$MK_SHARED_LIB" in
-+ *-Wl,*) #(vi
-+ VERSIONED_SYMS="-Wl,--version-script,$with_versioned_syms"
-+ MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\[$]{VERSIONED_SYMS} -Wl,%"`
-+ CF_VERBOSE(MK_SHARED_LIB: $MK_SHARED_LIB)
-+ ;;
-+ *-dy*) #(vi
-+ VERSIONED_SYMS="-Wl,-M,$with_versioned_syms"
-+ MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\[$]{VERSIONED_SYMS} -dy%"`
-+ CF_VERBOSE(MK_SHARED_LIB: $MK_SHARED_LIB)
-+ ;;
-+ *)
-+ AC_MSG_WARN(this system does not support versioned-symbols)
-+ ;;
-+ esac
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_XOPEN_SOURCE version: 48 updated: 2014/09/01 12:29:14
- 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,
-@@ -6496,16 +7374,17 @@
- dnl $1 is the nominal value for _XOPEN_SOURCE
- dnl $2 is the nominal value for _POSIX_C_SOURCE
- AC_DEFUN([CF_XOPEN_SOURCE],[
-+AC_REQUIRE([AC_CANONICAL_HOST])
-
- cf_XOPEN_SOURCE=ifelse([$1],,500,[$1])
- cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2])
- cf_xopen_source=
-
- case $host_os in #(vi
--aix[[456]]*) #(vi
-+aix[[4-7]]*) #(vi
- cf_xopen_source="-D_ALL_SOURCE"
- ;;
--cygwin) #(vi
-+cygwin|msys) #(vi
- cf_XOPEN_SOURCE=600
- ;;
- darwin[[0-8]].*) #(vi
-@@ -6513,6 +7392,7 @@
- ;;
- darwin*) #(vi
- cf_xopen_source="-D_DARWIN_C_SOURCE"
-+ cf_XOPEN_SOURCE=
- ;;
- freebsd*|dragonfly*) #(vi
- # 5.x headers associate
-@@ -6530,15 +7410,26 @@
- ;;
- irix[[56]].*) #(vi
- cf_xopen_source="-D_SGI_SOURCE"
-+ cf_XOPEN_SOURCE=
- ;;
- linux*|gnu*|mint*|k*bsd*-gnu) #(vi
- CF_GNU_SOURCE
- ;;
-+minix*) #(vi
-+ cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
-+ ;;
- 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,41 +7443,50 @@
- 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__"
-+ cf_cv_xopen_source=broken
-+ ;;
-+sysv4.2uw2.*) # Novell/SCO UnixWare 2.x (tested on 2.1.2)
-+ cf_XOPEN_SOURCE=
-+ cf_POSIX_C_SOURCE=
- ;;
- *)
-- AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
-- AC_TRY_COMPILE([#include ],[
-+ CF_TRY_XOPEN_SOURCE
-+ CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
-+ ;;
-+esac
-+
-+if test -n "$cf_xopen_source" ; then
-+ CF_ADD_CFLAGS($cf_xopen_source,true)
-+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_cv_xopen_source=no],
-- [cf_save="$CPPFLAGS"
-- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
-- AC_TRY_COMPILE([#include ],[
--#ifdef _XOPEN_SOURCE
-+ [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_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)
-+ [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
-- CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
-- ;;
--esac
--
--if test -n "$cf_xopen_source" ; then
-- CF_ADD_CFLAGS($cf_xopen_source)
- fi
- ])
-Index: announce.html.in
-Prereq: 1.85
---- ncurses-5.9/announce.html.in 2011-04-04 00:05:34.000000000 +0000
-+++ ncurses-5.9-20141206/announce.html.in 2013-05-18 10:12:25.000000000 +0000
-@@ -1,8 +1,7 @@
--
-
-+
-
-
-
-
-+ "HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
-
- Announcing ncurses @VERSION@
-
-@@ -42,12 +42,13 @@
-
-
-
--
Announcing ncurses @VERSION@
The ncurses (new curses)
-- library is a free software emulation of curses in System V
-- Release 4.0, and more. It uses terminfo format, supports pads and
-- color and multiple highlights and forms characters and
-- function-key mapping, and has all the other SYSV-curses
-- enhancements over BSD curses.
-+
Announcing ncurses @VERSION@
-+
-+
The ncurses (new curses) library is a free software emulation
-+ of curses in System V Release 4.0, and more. It uses terminfo
-+ format, supports pads and color and multiple highlights and forms
-+ characters and function-key mapping, and has all the other
-+ SYSV-curses enhancements over BSD curses.
-
-
In mid-June 1995, the maintainer of 4.4BSD curses declared
- that he considered 4.4BSD curses obsolete, and encouraged the
-@@ -73,38 +74,50 @@
- It is also available at ftp://invisible-island.net/ncurses/ .
-
--
Release Notes
This release is designed to be upward
-- compatible from ncurses 5.0 through 5.8; very few applications
-- will require recompilation, depending on the platform. These are
-- the highlights from the change-log since ncurses 5.8 release.
--
-- This is a bug-fix release, correcting a small number of urgent problems
-- in the ncurses library from the 5.8 release.
--
-- It also improves the Ada95 binding:
-+
Release Notes
-+
-+
This release is designed to be upward compatible from ncurses
-+ 5.0 through 5.8; very few applications will require
-+ recompilation, depending on the platform. These are the
-+ highlights from the change-log since ncurses 5.8 release.
-+
-+
This is a bug-fix release, correcting a small number of urgent
-+ problems in the ncurses library from the 5.8 release.
-+
-+
It also improves the Ada95 binding:
-+
-
--
fixes a longstanding portability problem with its use of the
-- set_field_type
-- function. Because that function uses variable-length argument lists,
-- its interface with gnat does not work with certain platforms.
--
improves configurability and portability, particularly when built
-- separately from the main ncurses tree. The 5.8 release introduced
-- scripts which can be used to construct separate tarballs for the
-- Ada95 and ncurses examples.
--
Those were a proof of concept. For the 5.9 release, those
-- scripts are augmented with rpm- and dpkg-scripts used in test builds
-- against a variety of gnat- and system ncurses versions as old as
-- gnat 3.15 and ncurses 5.4 (see snapshots and systems tested
-- here.
--
additional improvements were made for portability of the
-- ncurses examples, adding rpm- and dpkg-scripts for test-builds.
-- See
-- this page
-- for snapshots and other information.
-+
fixes a longstanding portability problem with its use of
-+ the set_field_type
-+ function. Because that function uses variable-length argument
-+ lists, its interface with gnat does not work with certain
-+ platforms.
-+
-+
improves configurability and portability, particularly when
-+ built separately from the main ncurses tree. The 5.8 release
-+ introduced scripts which can be used to construct separate
-+ tarballs for the Ada95 and ncurses examples.
-+
-+
Those were a proof of concept. For the 5.9 release, those
-+ scripts are augmented with rpm- and dpkg-scripts used in test
-+ builds against a variety of gnat- and system ncurses versions
-+ as old as gnat 3.15 and ncurses 5.4 (see snapshots and
-+ systems tested here.
-+
-+
-+
additional improvements were made for portability of the
-+ ncurses examples, adding rpm- and dpkg-scripts for test-builds.
-+ See this
-+ page for snapshots and other information.
-
-
--
Features of Ncurses
The ncurses package is fully
-- compatible with SVr4 (System V Release 4) curses:
-+
Features of Ncurses
-+
-+
The ncurses package is fully compatible with SVr4 (System V
-+ Release 4) curses:
-
-
-
All 257 of the SVr4 calls have been implemented (and are
-@@ -132,8 +145,10 @@
- entries for use with less capable
- curses/terminfo versions such
- as the HP/UX and AIX ports.
--
The ncurses package also has many useful extensions over
-- SVr4:
-+
-+
-+
The ncurses package also has many useful extensions over
-+ SVr4:
-
-
-
The API is 8-bit clean and base-level conformant with the
-@@ -249,12 +264,14 @@
- interface.
-
-
--
State of the Package
Numerous bugs present in earlier
-- versions have been fixed; the library is far more reliable than
-- it used to be. Bounds checking in many `dangerous' entry points
-- has been improved. The code is now type-safe according to gcc
-- -Wall. The library has been checked for malloc leaks and arena
-- corruption by the Purify memory-allocation tester.
-+
State of the Package
-+
-+
Numerous bugs present in earlier versions have been fixed; the
-+ library is far more reliable than it used to be. Bounds checking
-+ in many `dangerous' entry points has been improved. The code is
-+ now type-safe according to gcc -Wall. The library has been
-+ checked for malloc leaks and arena corruption by the Purify
-+ memory-allocation tester.
-
-
The ncurses code has been tested with a wide variety of
- applications including (versions starting with those noted):
-- as well as some that use ncurses for the terminfo support
-- alone:
-+
-+
-+
as well as some that use ncurses for the terminfo support
-+ alone:
-
-
-
minicom
-@@ -341,15 +360,17 @@
-
The ncurses distribution includes a selection of test programs
- (including a few games).
-
--
Who's Who and What's What
Zeyd Ben-Halim started it from
-- a previous package pcurses, written by Pavel Curtis. Eric S.
-- Raymond continued development. Jürgen Pfeifer wrote most of
-- the form and menu libraries. Ongoing work is being done by
-- Thomas Dickey.
-- Thomas Dickey acts as the maintainer for the Free Software
-- Foundation, which holds the copyright on ncurses. Contact the
-- current maintainers at bug-ncurses@gnu.org.
-+
Who's Who and What's What
-+
-+
Zeyd Ben-Halim started it from a previous package pcurses,
-+ written by Pavel Curtis. Eric S. Raymond continued development.
-+ Jürgen Pfeifer wrote most of the form and menu libraries.
-+ Ongoing work is being done by Thomas Dickey. Thomas
-+ Dickey acts as the maintainer for the Free Software Foundation,
-+ which holds the copyright on ncurses. Contact the current
-+ maintainers at bug-ncurses@gnu.org.
-
-
To join the ncurses mailing list, please write email to
- bug-ncurses-request@gnu.org containing the line: