1# ncurses 6.1 - patch 20190921 - Thomas E. Dickey 2# 3# ------------------------------------------------------------------------------ 4# 5# Ncurses 6.1 is at 6# ftp.gnu.org:/pub/gnu 7# 8# Patches for ncurses 6.1 can be found at 9# ftp://ftp.invisible-island.net/ncurses/6.1 10# http://invisible-mirror.net/archives/ncurses/6.1 11# 12# ------------------------------------------------------------------------------ 13# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190921.patch.gz 14# patch by Thomas E. Dickey <dickey@invisible-island.net> 15# created Sun Sep 22 01:25:51 UTC 2019 16# ------------------------------------------------------------------------------ 17# Ada95/aclocal.m4 | 90 +++++-- 18# Ada95/configure | 256 +++++++++++----------- 19# Ada95/gen/adacurses-config.in | 4 20# NEWS | 8 21# VERSION | 2 22# aclocal.m4 | 145 +++++++----- 23# configure | 372 ++++++++++++++++---------------- 24# dist.mk | 4 25# doc/html/man/adacurses6-config.1.html | 6 26# doc/html/man/captoinfo.1m.html | 2 27# doc/html/man/clear.1.html | 2 28# doc/html/man/form.3x.html | 2 29# doc/html/man/infocmp.1m.html | 2 30# doc/html/man/infotocap.1m.html | 2 31# doc/html/man/menu.3x.html | 2 32# doc/html/man/ncurses.3x.html | 2 33# doc/html/man/ncurses6-config.1.html | 2 34# doc/html/man/panel.3x.html | 2 35# doc/html/man/resizeterm.3x.html | 53 ++-- 36# doc/html/man/tabs.1.html | 2 37# doc/html/man/terminfo.5.html | 2 38# doc/html/man/tic.1m.html | 2 39# doc/html/man/toe.1m.html | 2 40# doc/html/man/tput.1.html | 2 41# doc/html/man/tset.1.html | 2 42# man/resizeterm.3x | 16 + 43# package/debian-mingw/changelog | 4 44# package/debian-mingw64/changelog | 4 45# package/debian/changelog | 4 46# package/mingw-ncurses.nsi | 4 47# package/mingw-ncurses.spec | 2 48# package/ncurses.spec | 2 49# package/ncursest.spec | 2 50# 33 files changed, 561 insertions(+), 447 deletions(-) 51# ------------------------------------------------------------------------------ 52Index: Ada95/aclocal.m4 53Prereq: 1.145 54--- ncurses-6.1-20190914+/Ada95/aclocal.m4 2019-09-07 23:37:09.000000000 +0000 55+++ ncurses-6.1-20190921/Ada95/aclocal.m4 2019-09-21 22:12:40.000000000 +0000 56@@ -28,7 +28,7 @@ 57 dnl 58 dnl Author: Thomas E. Dickey 59 dnl 60-dnl $Id: aclocal.m4,v 1.145 2019/09/07 23:37:09 tom Exp $ 61+dnl $Id: aclocal.m4,v 1.146 2019/09/21 22:12:40 tom Exp $ 62 dnl Macros used in NCURSES Ada95 auto-configuration script. 63 dnl 64 dnl These macros are maintained separately from NCURSES. The copyright on 65@@ -677,6 +677,22 @@ 66 fi 67 ])dnl 68 dnl --------------------------------------------------------------------------- 69+dnl CF_CHECK_GNAT_VERSION version: 1 updated: 2019/09/21 18:08:42 70+dnl --------------------- 71+AC_DEFUN([CF_CHECK_GNAT_VERSION], 72+[ 73+AC_REQUIRE([CF_GNAT_VERSION]) 74+case $cf_gnat_version in 75+(3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]]) 76+ cf_cv_prog_gnat_correct=yes 77+ ;; 78+(*) 79+ AC_MSG_WARN(Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding.) 80+ cf_cv_prog_gnat_correct=no 81+ ;; 82+esac 83+]) 84+dnl --------------------------------------------------------------------------- 85 dnl CF_CLANG_COMPILER version: 2 updated: 2013/11/19 19:23:35 86 dnl ----------------- 87 dnl Check if the given compiler is really clang. clang's C driver defines 88@@ -1536,27 +1552,21 @@ 89 rm -rf conftest* *~conftest* 90 ])dnl 91 dnl --------------------------------------------------------------------------- 92-dnl CF_GNAT_VERSION version: 20 updated: 2015/04/18 08:56:57 93+dnl CF_GNAT_VERSION version: 21 updated: 2019/09/21 18:08:42 94 dnl --------------- 95-dnl Verify version of GNAT. 96+dnl $1 = cache variable to update 97+dnl $2 = program name 98+dnl Verify version of GNAT or related tool 99 AC_DEFUN([CF_GNAT_VERSION], 100 [ 101-AC_MSG_CHECKING(for gnat version) 102-cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ 103+AC_CACHE_CHECK(for ifelse($2,,gnat,$2) version, cf_gnat_version,[ 104+cf_gnat_version=`ifelse($2,,${cf_ada_make:-gnatmake},$2) --version 2>&1 | \ 105 grep '[[0-9]].[[0-9]][[0-9]]*' |\ 106 sed -e '2,$d' -e 's/[[^0-9 \.]]//g' -e 's/^[[ ]]*//' -e 's/ .*//'` 107-AC_MSG_RESULT($cf_gnat_version) 108- 109-case $cf_gnat_version in 110-(3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]]) 111- cf_cv_prog_gnat_correct=yes 112- ;; 113-(*) 114- AC_MSG_WARN(Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding.) 115- cf_cv_prog_gnat_correct=no 116- ;; 117-esac 118 ]) 119+test -z "$cf_gnat_version" && cf_gnat_version=no 120+ifelse($1,,,[eval $1=$cf_gnat_version; unset cf_gnat_version]) 121+])dnl 122 dnl --------------------------------------------------------------------------- 123 dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41 124 dnl ------------- 125@@ -3138,20 +3148,40 @@ 126 test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the program extension (normally blank)]) 127 ])dnl 128 dnl --------------------------------------------------------------------------- 129-dnl CF_PROG_GNAT version: 8 updated: 2018/11/10 19:47:04 130+dnl CF_PROG_GNAT version: 9 updated: 2019/09/21 18:08:42 131 dnl ------------ 132-dnl Check for gnatmake, ensure that it is complete. 133+dnl Check for gnat/gnatmake/etc, ensure that the toolset is complete. 134 AC_DEFUN([CF_PROG_GNAT],[ 135-cf_ada_make=gnatmake 136-cf_ada_config="#" 137-AC_CHECK_PROG(gnatmake_exists, $cf_ada_make, yes, no) 138-if test "$ac_cv_prog_gnatmake_exists" = no; then 139+for cf_prog_gnat in gnat gnatmake gprconfig gprbuild 140+do 141+ CF_UPPER(cf_upper_prog_gnat,${cf_prog_gnat}) 142+ 143+ unset ac_cv_path_cf_TEMP_gnat 144+ unset cf_TEMP_gnat 145+ AC_PATH_PROG(cf_TEMP_gnat,$cf_prog_gnat,no) 146+ eval cf_cv_PATH_$cf_upper_prog_gnat=[$]ac_cv_path_cf_TEMP_gnat 147+ 148+ if test "x$cf_TEMP_gnat" != xno; then 149+ unset cf_gnat_version 150+ unset cf_TEMP_gnat 151+ CF_GNAT_VERSION(cf_TEMP_gnat,$cf_prog_gnat) 152+ fi 153+ eval cf_cv_VERSION_$cf_upper_prog_gnat=[$]cf_TEMP_gnat 154+ 155+ unset cf_TEMP_gnat 156+ unset cf_gnat_version 157+ unset ac_cv_path_cf_TEMP_gnat 158+done 159+ 160+if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then 161 cf_ada_make= 162 cf_cv_prog_gnat_correct=no 163 else 164- AC_CHECK_PROG(gprconfig_exists, gprconfig, yes, no) 165- if test "$ac_cv_prog_gprconfig_exists" = yes 166- then 167+ cf_ada_make=gnatmake 168+ if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then 169+ # gprconfig is newer than gnatmake; we can continue... 170+ cf_ada_config="##" 171+ else 172 rm -rf conftest* *~conftest* 173 if mkdir conftest.src 174 then 175@@ -3187,17 +3217,15 @@ 176 cd .. 177 rm -rf conftest* *~conftest* 178 fi 179- else 180- # gprconfig is newer than gnatmake; we can continue... 181- cf_ada_config="##" 182 fi 183 if test "x$cf_ada_config" != "x#" 184 then 185 CF_GNAT_VERSION 186+ CF_CHECK_GNAT_VERSION 187 AC_CHECK_PROG(M4_exists, m4, yes, no) 188 if test "$ac_cv_prog_M4_exists" = no; then 189 cf_cv_prog_gnat_correct=no 190- echo Ada95 binding required program m4 not found. Ada95 binding disabled. 191+ AC_MSG_WARN(Ada95 binding required program m4 not found. Ada95 binding disabled) 192 fi 193 if test "$cf_cv_prog_gnat_correct" = yes; then 194 AC_MSG_CHECKING(if GNAT works) 195@@ -3209,7 +3237,9 @@ 196 Text_IO.Put ("Hello World"); 197 Text_IO.New_Line; 198 GNAT.OS_Lib.OS_Exit (0); 199-end conftest;],[cf_cv_prog_gnat_correct=yes],[cf_cv_prog_gnat_correct=no]) 200+end conftest;], 201+[cf_cv_prog_gnat_correct=yes], 202+[cf_cv_prog_gnat_correct=no]) 203 AC_MSG_RESULT($cf_cv_prog_gnat_correct) 204 fi 205 else 206Index: Ada95/configure 207--- ncurses-6.1-20190914+/Ada95/configure 2019-09-14 19:53:04.000000000 +0000 208+++ ncurses-6.1-20190921/Ada95/configure 2019-09-21 22:12:48.000000000 +0000 209@@ -15676,80 +15676,90 @@ 210 cf_with_ada=yes 211 if test "$cf_with_ada" != "no" ; then 212 213-cf_ada_make=gnatmake 214-cf_ada_config="#" 215-# Extract the first word of "$cf_ada_make", so it can be a program name with args. 216-set dummy $cf_ada_make; ac_word=$2 217-echo "$as_me:15683: checking for $ac_word" >&5 218+for cf_prog_gnat in gnat gnatmake gprconfig gprbuild 219+do 220+ 221+cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 222+ 223+ unset ac_cv_path_cf_TEMP_gnat 224+ unset cf_TEMP_gnat 225+ # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. 226+set dummy $cf_prog_gnat; ac_word=$2 227+echo "$as_me:15688: checking for $ac_word" >&5 228 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 229-if test "${ac_cv_prog_gnatmake_exists+set}" = set; then 230+if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then 231 echo $ECHO_N "(cached) $ECHO_C" >&6 232 else 233- if test -n "$gnatmake_exists"; then 234- ac_cv_prog_gnatmake_exists="$gnatmake_exists" # Let the user override the test. 235-else 236+ case $cf_TEMP_gnat in 237+ [\\/]* | ?:[\\/]*) 238+ ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path. 239+ ;; 240+ *) 241 ac_save_IFS=$IFS; IFS=$ac_path_separator 242 ac_dummy="$PATH" 243 for ac_dir in $ac_dummy; do 244 IFS=$ac_save_IFS 245 test -z "$ac_dir" && ac_dir=. 246- $as_executable_p "$ac_dir/$ac_word" || continue 247-ac_cv_prog_gnatmake_exists="yes" 248-echo "$as_me:15698: found $ac_dir/$ac_word" >&5 249-break 250+ if $as_executable_p "$ac_dir/$ac_word"; then 251+ ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" 252+ echo "$as_me:15705: found $ac_dir/$ac_word" >&5 253+ break 254+fi 255 done 256 257- test -z "$ac_cv_prog_gnatmake_exists" && ac_cv_prog_gnatmake_exists="no" 258-fi 259+ test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no" 260+ ;; 261+esac 262 fi 263-gnatmake_exists=$ac_cv_prog_gnatmake_exists 264-if test -n "$gnatmake_exists"; then 265- echo "$as_me:15707: result: $gnatmake_exists" >&5 266-echo "${ECHO_T}$gnatmake_exists" >&6 267+cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat 268+ 269+if test -n "$cf_TEMP_gnat"; then 270+ echo "$as_me:15717: result: $cf_TEMP_gnat" >&5 271+echo "${ECHO_T}$cf_TEMP_gnat" >&6 272 else 273- echo "$as_me:15710: result: no" >&5 274+ echo "$as_me:15720: result: no" >&5 275 echo "${ECHO_T}no" >&6 276 fi 277 278-if test "$ac_cv_prog_gnatmake_exists" = no; then 279- cf_ada_make= 280- cf_cv_prog_gnat_correct=no 281-else 282- # Extract the first word of "gprconfig", so it can be a program name with args. 283-set dummy gprconfig; ac_word=$2 284-echo "$as_me:15720: checking for $ac_word" >&5 285-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 286-if test "${ac_cv_prog_gprconfig_exists+set}" = set; then 287+ eval cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat 288+ 289+ if test "x$cf_TEMP_gnat" != xno; then 290+ unset cf_gnat_version 291+ unset cf_TEMP_gnat 292+ 293+echo "$as_me:15730: checking for $cf_prog_gnat version" >&5 294+echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 295+if test "${cf_gnat_version+set}" = set; then 296 echo $ECHO_N "(cached) $ECHO_C" >&6 297 else 298- if test -n "$gprconfig_exists"; then 299- ac_cv_prog_gprconfig_exists="$gprconfig_exists" # Let the user override the test. 300-else 301- ac_save_IFS=$IFS; IFS=$ac_path_separator 302-ac_dummy="$PATH" 303-for ac_dir in $ac_dummy; do 304- IFS=$ac_save_IFS 305- test -z "$ac_dir" && ac_dir=. 306- $as_executable_p "$ac_dir/$ac_word" || continue 307-ac_cv_prog_gprconfig_exists="yes" 308-echo "$as_me:15735: found $ac_dir/$ac_word" >&5 309-break 310-done 311 312- test -z "$ac_cv_prog_gprconfig_exists" && ac_cv_prog_gprconfig_exists="no" 313-fi 314-fi 315-gprconfig_exists=$ac_cv_prog_gprconfig_exists 316-if test -n "$gprconfig_exists"; then 317- echo "$as_me:15744: result: $gprconfig_exists" >&5 318-echo "${ECHO_T}$gprconfig_exists" >&6 319-else 320- echo "$as_me:15747: result: no" >&5 321-echo "${ECHO_T}no" >&6 322+cf_gnat_version=`$cf_prog_gnat --version 2>&1 | \ 323+ grep '[0-9].[0-9][0-9]*' |\ 324+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` 325+ 326 fi 327+echo "$as_me:15741: result: $cf_gnat_version" >&5 328+echo "${ECHO_T}$cf_gnat_version" >&6 329+test -z "$cf_gnat_version" && cf_gnat_version=no 330+eval cf_TEMP_gnat=$cf_gnat_version; unset cf_gnat_version 331 332- if test "$ac_cv_prog_gprconfig_exists" = yes 333- then 334+ fi 335+ eval cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat 336+ 337+ unset cf_TEMP_gnat 338+ unset cf_gnat_version 339+ unset ac_cv_path_cf_TEMP_gnat 340+done 341+ 342+if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then 343+ cf_ada_make= 344+ cf_cv_prog_gnat_correct=no 345+else 346+ cf_ada_make=gnatmake 347+ if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then 348+ # gprconfig is newer than gnatmake; we can continue... 349+ cf_ada_config="##" 350+ else 351 rm -rf conftest* *~conftest* 352 if mkdir conftest.src 353 then 354@@ -15757,7 +15767,7 @@ 355 cd conftest.src 356 for cf_gprconfig in Ada C 357 do 358- echo "$as_me:15760: checking for gprconfig name for $cf_gprconfig" >&5 359+ echo "$as_me:15770: checking for gprconfig name for $cf_gprconfig" >&5 360 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 361 if test $cf_gprconfig = C 362 then 363@@ -15776,10 +15786,10 @@ 364 if test -n "$cf_gprconfig_value" 365 then 366 eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value 367- echo "$as_me:15779: result: $cf_gprconfig_value" >&5 368+ echo "$as_me:15789: result: $cf_gprconfig_value" >&5 369 echo "${ECHO_T}$cf_gprconfig_value" >&6 370 else 371- echo "$as_me:15782: result: missing" >&5 372+ echo "$as_me:15792: result: missing" >&5 373 echo "${ECHO_T}missing" >&6 374 cf_ada_config="#" 375 break 376@@ -15788,27 +15798,31 @@ 377 cd .. 378 rm -rf conftest* *~conftest* 379 fi 380- else 381- # gprconfig is newer than gnatmake; we can continue... 382- cf_ada_config="##" 383 fi 384 if test "x$cf_ada_config" != "x#" 385 then 386 387-echo "$as_me:15798: checking for gnat version" >&5 388+echo "$as_me:15805: checking for gnat version" >&5 389 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 390-cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ 391+if test "${cf_gnat_version+set}" = set; then 392+ echo $ECHO_N "(cached) $ECHO_C" >&6 393+else 394+ 395+cf_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ 396 grep '[0-9].[0-9][0-9]*' |\ 397 sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` 398-echo "$as_me:15803: result: $cf_gnat_version" >&5 399+ 400+fi 401+echo "$as_me:15816: result: $cf_gnat_version" >&5 402 echo "${ECHO_T}$cf_gnat_version" >&6 403+test -z "$cf_gnat_version" && cf_gnat_version=no 404 405 case $cf_gnat_version in 406 (3.1[1-9]*|3.[2-9]*|[4-9].*|20[0-9][0-9]) 407 cf_cv_prog_gnat_correct=yes 408 ;; 409 (*) 410- { echo "$as_me:15811: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 411+ { echo "$as_me:15825: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 412 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} 413 cf_cv_prog_gnat_correct=no 414 ;; 415@@ -15816,7 +15830,7 @@ 416 417 # Extract the first word of "m4", so it can be a program name with args. 418 set dummy m4; ac_word=$2 419-echo "$as_me:15819: checking for $ac_word" >&5 420+echo "$as_me:15833: checking for $ac_word" >&5 421 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 422 if test "${ac_cv_prog_M4_exists+set}" = set; then 423 echo $ECHO_N "(cached) $ECHO_C" >&6 424@@ -15831,7 +15845,7 @@ 425 test -z "$ac_dir" && ac_dir=. 426 $as_executable_p "$ac_dir/$ac_word" || continue 427 ac_cv_prog_M4_exists="yes" 428-echo "$as_me:15834: found $ac_dir/$ac_word" >&5 429+echo "$as_me:15848: found $ac_dir/$ac_word" >&5 430 break 431 done 432 433@@ -15840,19 +15854,20 @@ 434 fi 435 M4_exists=$ac_cv_prog_M4_exists 436 if test -n "$M4_exists"; then 437- echo "$as_me:15843: result: $M4_exists" >&5 438+ echo "$as_me:15857: result: $M4_exists" >&5 439 echo "${ECHO_T}$M4_exists" >&6 440 else 441- echo "$as_me:15846: result: no" >&5 442+ echo "$as_me:15860: result: no" >&5 443 echo "${ECHO_T}no" >&6 444 fi 445 446 if test "$ac_cv_prog_M4_exists" = no; then 447 cf_cv_prog_gnat_correct=no 448- echo Ada95 binding required program m4 not found. Ada95 binding disabled. 449+ { echo "$as_me:15866: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 450+echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} 451 fi 452 if test "$cf_cv_prog_gnat_correct" = yes; then 453- echo "$as_me:15855: checking if GNAT works" >&5 454+ echo "$as_me:15870: checking if GNAT works" >&5 455 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 456 457 rm -rf conftest* *~conftest* 458@@ -15880,7 +15895,7 @@ 459 fi 460 rm -rf conftest* *~conftest* 461 462- echo "$as_me:15883: result: $cf_cv_prog_gnat_correct" >&5 463+ echo "$as_me:15898: result: $cf_cv_prog_gnat_correct" >&5 464 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 465 fi 466 else 467@@ -15890,7 +15905,7 @@ 468 469 if test "$cf_cv_prog_gnat_correct" = yes; then 470 471- echo "$as_me:15893: checking optimization options for ADAFLAGS" >&5 472+ echo "$as_me:15908: checking optimization options for ADAFLAGS" >&5 473 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 474 case "$CFLAGS" in 475 (*-g*) 476@@ -15907,10 +15922,10 @@ 477 478 ;; 479 esac 480- echo "$as_me:15910: result: $ADAFLAGS" >&5 481+ echo "$as_me:15925: result: $ADAFLAGS" >&5 482 echo "${ECHO_T}$ADAFLAGS" >&6 483 484-echo "$as_me:15913: checking if GNATPREP supports -T option" >&5 485+echo "$as_me:15928: checking if GNATPREP supports -T option" >&5 486 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 487 if test "${cf_cv_gnatprep_opt_t+set}" = set; then 488 echo $ECHO_N "(cached) $ECHO_C" >&6 489@@ -15920,11 +15935,11 @@ 490 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes 491 492 fi 493-echo "$as_me:15923: result: $cf_cv_gnatprep_opt_t" >&5 494+echo "$as_me:15938: result: $cf_cv_gnatprep_opt_t" >&5 495 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 496 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" 497 498-echo "$as_me:15927: checking if GNAT supports generics" >&5 499+echo "$as_me:15942: checking if GNAT supports generics" >&5 500 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 501 case $cf_gnat_version in 502 (3.[1-9]*|[4-9].*) 503@@ -15934,7 +15949,7 @@ 504 cf_gnat_generics=no 505 ;; 506 esac 507-echo "$as_me:15937: result: $cf_gnat_generics" >&5 508+echo "$as_me:15952: result: $cf_gnat_generics" >&5 509 echo "${ECHO_T}$cf_gnat_generics" >&6 510 511 if test "$cf_gnat_generics" = yes 512@@ -15946,7 +15961,7 @@ 513 cf_generic_objects= 514 fi 515 516-echo "$as_me:15949: checking if GNAT supports SIGINT" >&5 517+echo "$as_me:15964: checking if GNAT supports SIGINT" >&5 518 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 519 if test "${cf_cv_gnat_sigint+set}" = set; then 520 echo $ECHO_N "(cached) $ECHO_C" >&6 521@@ -15994,7 +16009,7 @@ 522 rm -rf conftest* *~conftest* 523 524 fi 525-echo "$as_me:15997: result: $cf_cv_gnat_sigint" >&5 526+echo "$as_me:16012: result: $cf_cv_gnat_sigint" >&5 527 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 528 529 if test $cf_cv_gnat_sigint = yes ; then 530@@ -16007,7 +16022,7 @@ 531 cf_gnat_projects=no 532 533 if test "$enable_gnat_projects" != no ; then 534-echo "$as_me:16010: checking if GNAT supports project files" >&5 535+echo "$as_me:16025: checking if GNAT supports project files" >&5 536 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 537 case $cf_gnat_version in 538 (3.[0-9]*) 539@@ -16070,15 +16085,15 @@ 540 esac 541 ;; 542 esac 543-echo "$as_me:16073: result: $cf_gnat_projects" >&5 544+echo "$as_me:16088: result: $cf_gnat_projects" >&5 545 echo "${ECHO_T}$cf_gnat_projects" >&6 546 fi # enable_gnat_projects 547 548 if test $cf_gnat_projects = yes 549 then 550- echo "$as_me:16079: checking if GNAT supports libraries" >&5 551+ echo "$as_me:16094: checking if GNAT supports libraries" >&5 552 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 553- echo "$as_me:16081: result: $cf_gnat_libraries" >&5 554+ echo "$as_me:16096: result: $cf_gnat_libraries" >&5 555 echo "${ECHO_T}$cf_gnat_libraries" >&6 556 fi 557 558@@ -16098,7 +16113,7 @@ 559 USE_GNAT_LIBRARIES="#" 560 fi 561 562-echo "$as_me:16101: checking for ada-compiler" >&5 563+echo "$as_me:16116: checking for ada-compiler" >&5 564 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 565 566 # Check whether --with-ada-compiler or --without-ada-compiler was given. 567@@ -16109,12 +16124,12 @@ 568 cf_ada_compiler=gnatmake 569 fi; 570 571-echo "$as_me:16112: result: $cf_ada_compiler" >&5 572+echo "$as_me:16127: result: $cf_ada_compiler" >&5 573 echo "${ECHO_T}$cf_ada_compiler" >&6 574 575 cf_ada_package=terminal_interface 576 577-echo "$as_me:16117: checking for ada-include" >&5 578+echo "$as_me:16132: checking for ada-include" >&5 579 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 580 581 # Check whether --with-ada-include or --without-ada-include was given. 582@@ -16150,7 +16165,7 @@ 583 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 584 ;; 585 (*) 586- { { echo "$as_me:16153: error: expected a pathname, not \"$withval\"" >&5 587+ { { echo "$as_me:16168: error: expected a pathname, not \"$withval\"" >&5 588 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 589 { (exit 1); exit 1; }; } 590 ;; 591@@ -16159,10 +16174,10 @@ 592 fi 593 eval ADA_INCLUDE="$withval" 594 595-echo "$as_me:16162: result: $ADA_INCLUDE" >&5 596+echo "$as_me:16177: result: $ADA_INCLUDE" >&5 597 echo "${ECHO_T}$ADA_INCLUDE" >&6 598 599-echo "$as_me:16165: checking for ada-objects" >&5 600+echo "$as_me:16180: checking for ada-objects" >&5 601 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 602 603 # Check whether --with-ada-objects or --without-ada-objects was given. 604@@ -16198,7 +16213,7 @@ 605 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 606 ;; 607 (*) 608- { { echo "$as_me:16201: error: expected a pathname, not \"$withval\"" >&5 609+ { { echo "$as_me:16216: error: expected a pathname, not \"$withval\"" >&5 610 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 611 { (exit 1); exit 1; }; } 612 ;; 613@@ -16207,10 +16222,10 @@ 614 fi 615 eval ADA_OBJECTS="$withval" 616 617-echo "$as_me:16210: result: $ADA_OBJECTS" >&5 618+echo "$as_me:16225: result: $ADA_OBJECTS" >&5 619 echo "${ECHO_T}$ADA_OBJECTS" >&6 620 621-echo "$as_me:16213: checking if an Ada95 shared-library should be built" >&5 622+echo "$as_me:16228: checking if an Ada95 shared-library should be built" >&5 623 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 624 625 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. 626@@ -16220,14 +16235,14 @@ 627 else 628 with_ada_sharedlib=no 629 fi; 630-echo "$as_me:16223: result: $with_ada_sharedlib" >&5 631+echo "$as_me:16238: result: $with_ada_sharedlib" >&5 632 echo "${ECHO_T}$with_ada_sharedlib" >&6 633 634 if test "x$with_ada_sharedlib" != xno 635 then 636 if test "x$cf_gnat_projects" != xyes 637 then 638- { echo "$as_me:16230: WARNING: disabling shared-library since GNAT projects are not supported" >&5 639+ { echo "$as_me:16245: WARNING: disabling shared-library since GNAT projects are not supported" >&5 640 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} 641 with_ada_sharedlib=no 642 fi 643@@ -16247,7 +16262,7 @@ 644 645 # allow the Ada binding to be renamed 646 647-echo "$as_me:16250: checking for ada-libname" >&5 648+echo "$as_me:16265: checking for ada-libname" >&5 649 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 650 651 # Check whether --with-ada-libname or --without-ada-libname was given. 652@@ -16263,16 +16278,16 @@ 653 ;; 654 esac 655 656-echo "$as_me:16266: result: $ADA_LIBNAME" >&5 657+echo "$as_me:16281: result: $ADA_LIBNAME" >&5 658 echo "${ECHO_T}$ADA_LIBNAME" >&6 659 660 else 661- { { echo "$as_me:16270: error: No usable Ada compiler found" >&5 662+ { { echo "$as_me:16285: error: No usable Ada compiler found" >&5 663 echo "$as_me: error: No usable Ada compiler found" >&2;} 664 { (exit 1); exit 1; }; } 665 fi 666 else 667- { { echo "$as_me:16275: error: The Ada compiler is needed for this package" >&5 668+ { { echo "$as_me:16290: error: The Ada compiler is needed for this package" >&5 669 echo "$as_me: error: The Ada compiler is needed for this package" >&2;} 670 { (exit 1); exit 1; }; } 671 fi 672@@ -16312,7 +16327,7 @@ 673 fi 674 675 ### Build up pieces for makefile rules 676-echo "$as_me:16315: checking default library suffix" >&5 677+echo "$as_me:16330: checking default library suffix" >&5 678 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 679 680 case $DFT_LWR_MODEL in 681@@ -16323,10 +16338,10 @@ 682 (shared) DFT_ARG_SUFFIX='' ;; 683 esac 684 test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" 685-echo "$as_me:16326: result: $DFT_ARG_SUFFIX" >&5 686+echo "$as_me:16341: result: $DFT_ARG_SUFFIX" >&5 687 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 688 689-echo "$as_me:16329: checking default library-dependency suffix" >&5 690+echo "$as_me:16344: checking default library-dependency suffix" >&5 691 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 692 693 case X$DFT_LWR_MODEL in 694@@ -16384,10 +16399,10 @@ 695 DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" 696 DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" 697 fi 698-echo "$as_me:16387: result: $DFT_DEP_SUFFIX" >&5 699+echo "$as_me:16402: result: $DFT_DEP_SUFFIX" >&5 700 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 701 702-echo "$as_me:16390: checking default object directory" >&5 703+echo "$as_me:16405: checking default object directory" >&5 704 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 705 706 case $DFT_LWR_MODEL in 707@@ -16403,7 +16418,7 @@ 708 DFT_OBJ_SUBDIR='obj_s' ;; 709 esac 710 esac 711-echo "$as_me:16406: result: $DFT_OBJ_SUBDIR" >&5 712+echo "$as_me:16421: result: $DFT_OBJ_SUBDIR" >&5 713 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 714 715 ### Set up low-level terminfo dependencies for makefiles. 716@@ -16645,7 +16660,7 @@ 717 : ${CONFIG_STATUS=./config.status} 718 ac_clean_files_save=$ac_clean_files 719 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 720-{ echo "$as_me:16648: creating $CONFIG_STATUS" >&5 721+{ echo "$as_me:16663: creating $CONFIG_STATUS" >&5 722 echo "$as_me: creating $CONFIG_STATUS" >&6;} 723 cat >$CONFIG_STATUS <<_ACEOF 724 #! $SHELL 725@@ -16821,7 +16836,7 @@ 726 echo "$ac_cs_version"; exit 0 ;; 727 --he | --h) 728 # Conflict between --help and --header 729- { { echo "$as_me:16824: error: ambiguous option: $1 730+ { { echo "$as_me:16839: error: ambiguous option: $1 731 Try \`$0 --help' for more information." >&5 732 echo "$as_me: error: ambiguous option: $1 733 Try \`$0 --help' for more information." >&2;} 734@@ -16840,7 +16855,7 @@ 735 ac_need_defaults=false;; 736 737 # This is an error. 738- -*) { { echo "$as_me:16843: error: unrecognized option: $1 739+ -*) { { echo "$as_me:16858: error: unrecognized option: $1 740 Try \`$0 --help' for more information." >&5 741 echo "$as_me: error: unrecognized option: $1 742 Try \`$0 --help' for more information." >&2;} 743@@ -16912,7 +16927,7 @@ 744 "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; 745 "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 746 "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; 747- *) { { echo "$as_me:16915: error: invalid argument: $ac_config_target" >&5 748+ *) { { echo "$as_me:16930: error: invalid argument: $ac_config_target" >&5 749 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} 750 { (exit 1); exit 1; }; };; 751 esac 752@@ -17095,8 +17110,7 @@ 753 s,@ADAFLAGS@,$ADAFLAGS,;t t 754 s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t 755 s,@ADA_TRACE@,$ADA_TRACE,;t t 756-s,@gnatmake_exists@,$gnatmake_exists,;t t 757-s,@gprconfig_exists@,$gprconfig_exists,;t t 758+s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t 759 s,@M4_exists@,$M4_exists,;t t 760 s,@cf_ada_make@,$cf_ada_make,;t t 761 s,@cf_ada_config@,$cf_ada_config,;t t 762@@ -17265,7 +17279,7 @@ 763 esac 764 765 if test x"$ac_file" != x-; then 766- { echo "$as_me:17268: creating $ac_file" >&5 767+ { echo "$as_me:17282: creating $ac_file" >&5 768 echo "$as_me: creating $ac_file" >&6;} 769 rm -f "$ac_file" 770 fi 771@@ -17283,7 +17297,7 @@ 772 -) echo $tmp/stdin ;; 773 [\\/$]*) 774 # Absolute (can't be DOS-style, as IFS=:) 775- test -f "$f" || { { echo "$as_me:17286: error: cannot find input file: $f" >&5 776+ test -f "$f" || { { echo "$as_me:17300: error: cannot find input file: $f" >&5 777 echo "$as_me: error: cannot find input file: $f" >&2;} 778 { (exit 1); exit 1; }; } 779 echo $f;; 780@@ -17296,7 +17310,7 @@ 781 echo $srcdir/$f 782 else 783 # /dev/null tree 784- { { echo "$as_me:17299: error: cannot find input file: $f" >&5 785+ { { echo "$as_me:17313: error: cannot find input file: $f" >&5 786 echo "$as_me: error: cannot find input file: $f" >&2;} 787 { (exit 1); exit 1; }; } 788 fi;; 789@@ -17312,7 +17326,7 @@ 790 if test -n "$ac_seen"; then 791 ac_used=`grep '@datarootdir@' $ac_item` 792 if test -z "$ac_used"; then 793- { echo "$as_me:17315: WARNING: datarootdir was used implicitly but not set: 794+ { echo "$as_me:17329: WARNING: datarootdir was used implicitly but not set: 795 $ac_seen" >&5 796 echo "$as_me: WARNING: datarootdir was used implicitly but not set: 797 $ac_seen" >&2;} 798@@ -17321,7 +17335,7 @@ 799 fi 800 ac_seen=`grep '${datarootdir}' $ac_item` 801 if test -n "$ac_seen"; then 802- { echo "$as_me:17324: WARNING: datarootdir was used explicitly but not set: 803+ { echo "$as_me:17338: WARNING: datarootdir was used explicitly but not set: 804 $ac_seen" >&5 805 echo "$as_me: WARNING: datarootdir was used explicitly but not set: 806 $ac_seen" >&2;} 807@@ -17358,7 +17372,7 @@ 808 ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` 809 if test -z "$ac_init"; then 810 ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` 811- { echo "$as_me:17361: WARNING: Variable $ac_name is used but was not set: 812+ { echo "$as_me:17375: WARNING: Variable $ac_name is used but was not set: 813 $ac_seen" >&5 814 echo "$as_me: WARNING: Variable $ac_name is used but was not set: 815 $ac_seen" >&2;} 816@@ -17369,7 +17383,7 @@ 817 egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out 818 if test -s $tmp/out; then 819 ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` 820- { echo "$as_me:17372: WARNING: Some variables may not be substituted: 821+ { echo "$as_me:17386: WARNING: Some variables may not be substituted: 822 $ac_seen" >&5 823 echo "$as_me: WARNING: Some variables may not be substituted: 824 $ac_seen" >&2;} 825@@ -17418,7 +17432,7 @@ 826 * ) ac_file_in=$ac_file.in ;; 827 esac 828 829- test x"$ac_file" != x- && { echo "$as_me:17421: creating $ac_file" >&5 830+ test x"$ac_file" != x- && { echo "$as_me:17435: creating $ac_file" >&5 831 echo "$as_me: creating $ac_file" >&6;} 832 833 # First look for the input files in the build tree, otherwise in the 834@@ -17429,7 +17443,7 @@ 835 -) echo $tmp/stdin ;; 836 [\\/$]*) 837 # Absolute (can't be DOS-style, as IFS=:) 838- test -f "$f" || { { echo "$as_me:17432: error: cannot find input file: $f" >&5 839+ test -f "$f" || { { echo "$as_me:17446: error: cannot find input file: $f" >&5 840 echo "$as_me: error: cannot find input file: $f" >&2;} 841 { (exit 1); exit 1; }; } 842 echo $f;; 843@@ -17442,7 +17456,7 @@ 844 echo $srcdir/$f 845 else 846 # /dev/null tree 847- { { echo "$as_me:17445: error: cannot find input file: $f" >&5 848+ { { echo "$as_me:17459: error: cannot find input file: $f" >&5 849 echo "$as_me: error: cannot find input file: $f" >&2;} 850 { (exit 1); exit 1; }; } 851 fi;; 852@@ -17500,7 +17514,7 @@ 853 rm -f $tmp/in 854 if test x"$ac_file" != x-; then 855 if cmp -s $ac_file $tmp/config.h 2>/dev/null; then 856- { echo "$as_me:17503: $ac_file is unchanged" >&5 857+ { echo "$as_me:17517: $ac_file is unchanged" >&5 858 echo "$as_me: $ac_file is unchanged" >&6;} 859 else 860 ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 861Index: Ada95/gen/adacurses-config.in 862Prereq: 1.12 863--- ncurses-6.1-20190914+/Ada95/gen/adacurses-config.in 2019-09-07 20:20:52.000000000 +0000 864+++ ncurses-6.1-20190921/Ada95/gen/adacurses-config.in 2019-09-07 20:20:52.000000000 +0000 865@@ -1,7 +1,7 @@ 866 #! /bin/sh 867-# $Id: adacurses-config.in,v 1.12 2019/09/07 20:20:52 tom Exp $ 868+# $Id: adacurses-config.in,v 1.13 2019/09/07 20:20:52 tom Exp $ 869 ############################################################################## 870-# Copyright (c) 2007-2012,2016 Free Software Foundation, Inc. # 871+# Copyright (c) 2007-2016,2019 Free Software Foundation, Inc. # 872 # # 873 # Permission is hereby granted, free of charge, to any person obtaining a # 874 # copy of this software and associated documentation files (the "Software"), # 875Index: NEWS 876Prereq: 1.3373 877--- ncurses-6.1-20190914+/NEWS 2019-09-14 23:18:21.000000000 +0000 878+++ ncurses-6.1-20190921/NEWS 2019-09-21 23:47:04.000000000 +0000 879@@ -25,7 +25,7 @@ 880 -- sale, use or other dealings in this Software without prior written -- 881 -- authorization. -- 882 ------------------------------------------------------------------------------- 883--- $Id: NEWS,v 1.3373 2019/09/14 23:18:21 tom Exp $ 884+-- $Id: NEWS,v 1.3376 2019/09/21 23:47:04 tom Exp $ 885 ------------------------------------------------------------------------------- 886 887 This is a log of changes that ncurses has gone through since Zeyd started 888@@ -45,6 +45,12 @@ 889 Changes through 1.9.9e did not credit all contributions; 890 it is not possible to add this information. 891 892+20190921 893+ + add a note in resizeterm manpage about top-level windows which touch 894+ the screen's borders. 895+ + modify configure-checks for gnat to identify each of the tools path 896+ and version. 897+ 898 20190914 899 + build-fixes for Ada95 configure-script and corresponding test package 900 901Index: VERSION 902--- ncurses-6.1-20190914+/VERSION 2019-09-14 13:43:52.000000000 +0000 903+++ ncurses-6.1-20190921/VERSION 2019-09-21 14:56:20.000000000 +0000 904@@ -1 +1 @@ 905-5:0:10 6.1 20190914 906+5:0:10 6.1 20190921 907Index: aclocal.m4 908Prereq: 1.880 909--- ncurses-6.1-20190914+/aclocal.m4 2019-09-07 23:00:39.000000000 +0000 910+++ ncurses-6.1-20190921/aclocal.m4 2019-09-21 22:11:35.000000000 +0000 911@@ -28,7 +28,7 @@ 912 dnl 913 dnl Author: Thomas E. Dickey 1995-on 914 dnl 915-dnl $Id: aclocal.m4,v 1.880 2019/09/07 23:00:39 tom Exp $ 916+dnl $Id: aclocal.m4,v 1.883 2019/09/21 22:11:35 tom Exp $ 917 dnl Macros used in NCURSES auto-configuration script. 918 dnl 919 dnl These macros are maintained separately from NCURSES. The copyright on 920@@ -1137,6 +1137,22 @@ 921 fi 922 ])dnl 923 dnl --------------------------------------------------------------------------- 924+dnl CF_CHECK_GNAT_VERSION version: 1 updated: 2019/09/21 18:08:42 925+dnl --------------------- 926+AC_DEFUN([CF_CHECK_GNAT_VERSION], 927+[ 928+AC_REQUIRE([CF_GNAT_VERSION]) 929+case $cf_gnat_version in 930+(3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]]) 931+ cf_cv_prog_gnat_correct=yes 932+ ;; 933+(*) 934+ AC_MSG_WARN(Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding.) 935+ cf_cv_prog_gnat_correct=no 936+ ;; 937+esac 938+]) 939+dnl --------------------------------------------------------------------------- 940 dnl CF_CHECK_GPM_WGETCH version: 3 updated: 2017/01/21 11:06:25 941 dnl ------------------- 942 dnl Check if GPM is already linked with curses. If so - and if the linkage 943@@ -2947,27 +2963,21 @@ 944 rm -rf conftest* *~conftest* 945 ])dnl 946 dnl --------------------------------------------------------------------------- 947-dnl CF_GNAT_VERSION version: 20 updated: 2015/04/18 08:56:57 948+dnl CF_GNAT_VERSION version: 21 updated: 2019/09/21 18:08:42 949 dnl --------------- 950-dnl Verify version of GNAT. 951+dnl $1 = cache variable to update 952+dnl $2 = program name 953+dnl Verify version of GNAT or related tool 954 AC_DEFUN([CF_GNAT_VERSION], 955 [ 956-AC_MSG_CHECKING(for gnat version) 957-cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ 958+AC_CACHE_CHECK(for ifelse($2,,gnat,$2) version, cf_gnat_version,[ 959+cf_gnat_version=`ifelse($2,,${cf_ada_make:-gnatmake},$2) --version 2>&1 | \ 960 grep '[[0-9]].[[0-9]][[0-9]]*' |\ 961 sed -e '2,$d' -e 's/[[^0-9 \.]]//g' -e 's/^[[ ]]*//' -e 's/ .*//'` 962-AC_MSG_RESULT($cf_gnat_version) 963- 964-case $cf_gnat_version in 965-(3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]]) 966- cf_cv_prog_gnat_correct=yes 967- ;; 968-(*) 969- AC_MSG_WARN(Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding.) 970- cf_cv_prog_gnat_correct=no 971- ;; 972-esac 973 ]) 974+test -z "$cf_gnat_version" && cf_gnat_version=no 975+ifelse($1,,,[eval $1=$cf_gnat_version; unset cf_gnat_version]) 976+])dnl 977 dnl --------------------------------------------------------------------------- 978 dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41 979 dnl ------------- 980@@ -5974,20 +5984,40 @@ 981 test -z "$EGREP" && AC_MSG_ERROR(No egrep program found) 982 ])dnl 983 dnl --------------------------------------------------------------------------- 984-dnl CF_PROG_GNAT version: 8 updated: 2018/11/10 19:47:04 985+dnl CF_PROG_GNAT version: 9 updated: 2019/09/21 18:08:42 986 dnl ------------ 987-dnl Check for gnatmake, ensure that it is complete. 988+dnl Check for gnat/gnatmake/etc, ensure that the toolset is complete. 989 AC_DEFUN([CF_PROG_GNAT],[ 990-cf_ada_make=gnatmake 991-cf_ada_config="#" 992-AC_CHECK_PROG(gnatmake_exists, $cf_ada_make, yes, no) 993-if test "$ac_cv_prog_gnatmake_exists" = no; then 994+for cf_prog_gnat in gnat gnatmake gprconfig gprbuild 995+do 996+ CF_UPPER(cf_upper_prog_gnat,${cf_prog_gnat}) 997+ 998+ unset ac_cv_path_cf_TEMP_gnat 999+ unset cf_TEMP_gnat 1000+ AC_PATH_PROG(cf_TEMP_gnat,$cf_prog_gnat,no) 1001+ eval cf_cv_PATH_$cf_upper_prog_gnat=[$]ac_cv_path_cf_TEMP_gnat 1002+ 1003+ if test "x$cf_TEMP_gnat" != xno; then 1004+ unset cf_gnat_version 1005+ unset cf_TEMP_gnat 1006+ CF_GNAT_VERSION(cf_TEMP_gnat,$cf_prog_gnat) 1007+ fi 1008+ eval cf_cv_VERSION_$cf_upper_prog_gnat=[$]cf_TEMP_gnat 1009+ 1010+ unset cf_TEMP_gnat 1011+ unset cf_gnat_version 1012+ unset ac_cv_path_cf_TEMP_gnat 1013+done 1014+ 1015+if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then 1016 cf_ada_make= 1017 cf_cv_prog_gnat_correct=no 1018 else 1019- AC_CHECK_PROG(gprconfig_exists, gprconfig, yes, no) 1020- if test "$ac_cv_prog_gprconfig_exists" = yes 1021- then 1022+ cf_ada_make=gnatmake 1023+ if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then 1024+ # gprconfig is newer than gnatmake; we can continue... 1025+ cf_ada_config="##" 1026+ else 1027 rm -rf conftest* *~conftest* 1028 if mkdir conftest.src 1029 then 1030@@ -6023,17 +6053,15 @@ 1031 cd .. 1032 rm -rf conftest* *~conftest* 1033 fi 1034- else 1035- # gprconfig is newer than gnatmake; we can continue... 1036- cf_ada_config="##" 1037 fi 1038 if test "x$cf_ada_config" != "x#" 1039 then 1040 CF_GNAT_VERSION 1041+ CF_CHECK_GNAT_VERSION 1042 AC_CHECK_PROG(M4_exists, m4, yes, no) 1043 if test "$ac_cv_prog_M4_exists" = no; then 1044 cf_cv_prog_gnat_correct=no 1045- echo Ada95 binding required program m4 not found. Ada95 binding disabled. 1046+ AC_MSG_WARN(Ada95 binding required program m4 not found. Ada95 binding disabled) 1047 fi 1048 if test "$cf_cv_prog_gnat_correct" = yes; then 1049 AC_MSG_CHECKING(if GNAT works) 1050@@ -6045,7 +6073,9 @@ 1051 Text_IO.Put ("Hello World"); 1052 Text_IO.New_Line; 1053 GNAT.OS_Lib.OS_Exit (0); 1054-end conftest;],[cf_cv_prog_gnat_correct=yes],[cf_cv_prog_gnat_correct=no]) 1055+end conftest;], 1056+[cf_cv_prog_gnat_correct=yes], 1057+[cf_cv_prog_gnat_correct=no]) 1058 AC_MSG_RESULT($cf_cv_prog_gnat_correct) 1059 fi 1060 else 1061@@ -6985,7 +7015,7 @@ 1062 fi 1063 ])dnl 1064 dnl --------------------------------------------------------------------------- 1065-dnl CF_SRC_MODULES version: 30 updated: 2017/07/26 17:08:35 1066+dnl CF_SRC_MODULES version: 31 updated: 2019/09/21 18:08:42 1067 dnl -------------- 1068 dnl For each parameter, test if the source-directory exists, and if it contains 1069 dnl a 'modules' file. If so, add to the list $cf_cv_src_modules which we'll 1070@@ -6995,6 +7025,7 @@ 1071 dnl SUB_MAKEFILES which are used in the makefile-generation scheme. 1072 AC_DEFUN([CF_SRC_MODULES], 1073 [ 1074+AC_REQUIRE([CF_CHECK_GNAT_VERSION]) 1075 AC_MSG_CHECKING(for src modules) 1076 1077 # dependencies and linker-arguments for test-programs 1078@@ -8262,6 +8293,32 @@ 1079 1080 ])dnl 1081 dnl --------------------------------------------------------------------------- 1082+dnl CF_WITH_PATH_PROG version: 1 updated: 2019/06/30 19:44:43 1083+dnl ----------------- 1084+dnl Check for a given program, like CF_PATH_PROG, but allow override using a 1085+dnl "--with-xxx" option. 1086+dnl 1087+dnl Parameters: 1088+dnl $1 = environment variable to set/update 1089+dnl $2 = program name 1090+dnl $3 = help-text 1091+dnl $4 = $PATH 1092+AC_DEFUN([CF_WITH_PATH_PROG],[ 1093+AC_ARG_WITH($2-path, 1094+ [ --with-$2-path=XXX specify path of $2 ifelse($3,,,$3)], 1095+ [AC_MSG_CHECKING(for $2 program ifelse($3,,,$3)) 1096+ $1=$withval 1097+ AC_MSG_RESULT([$]$1) 1098+ CF_PATH_SYNTAX($1) 1099+ ], 1100+ [CF_PATH_PROG($1,$2,,ifelse($4,,,$4)) 1101+ if test -z "[$]$1" 1102+ then 1103+ AC_MSG_WARN(no $2 program found ifelse($3,,,$3)) 1104+ fi 1105+ ]) 1106+]) 1107+dnl --------------------------------------------------------------------------- 1108 dnl CF_WITH_PCRE2 version: 2 updated: 2018/07/14 16:47:56 1109 dnl ------------- 1110 dnl Add PCRE2 (Perl-compatible regular expressions v2) to the build if it is 1111@@ -8385,32 +8442,6 @@ 1112 AC_SUBST(PKG_CONFIG_LIBDIR) 1113 ])dnl 1114 dnl --------------------------------------------------------------------------- 1115-dnl CF_WITH_PATH_PROG version: 1 updated: 2019/06/30 19:44:43 1116-dnl ----------------- 1117-dnl Check for a given program, like CF_PATH_PROG, but allow override using a 1118-dnl "--with-xxx" option. 1119-dnl 1120-dnl Parameters: 1121-dnl $1 = environment variable to set/update 1122-dnl $2 = program name 1123-dnl $3 = help-text 1124-dnl $4 = $PATH 1125-AC_DEFUN([CF_WITH_PATH_PROG],[ 1126-AC_ARG_WITH($2-path, 1127- [ --with-$2-path=XXX specify path of $2 ifelse($3,,,$3)], 1128- [AC_MSG_CHECKING(for $2 program ifelse($3,,,$3)) 1129- $1=$withval 1130- AC_MSG_RESULT([$]$1) 1131- CF_PATH_SYNTAX($1) 1132- ], 1133- [CF_PATH_PROG($1,$2,,ifelse($4,,,$4)) 1134- if test -z "[$]$1" 1135- then 1136- AC_MSG_WARN(no $2 program found ifelse($3,,,$3)) 1137- fi 1138- ]) 1139-]) 1140-dnl --------------------------------------------------------------------------- 1141 dnl CF_WITH_PTHREAD version: 7 updated: 2015/04/18 08:56:57 1142 dnl --------------- 1143 dnl Check for POSIX thread library. 1144Index: configure 1145--- ncurses-6.1-20190914+/configure 2019-09-07 20:35:43.000000000 +0000 1146+++ ncurses-6.1-20190921/configure 2019-09-21 19:49:24.000000000 +0000 1147@@ -24176,80 +24176,90 @@ 1148 1149 if test "$cf_with_ada" != "no" ; then 1150 1151-cf_ada_make=gnatmake 1152-cf_ada_config="#" 1153-# Extract the first word of "$cf_ada_make", so it can be a program name with args. 1154-set dummy $cf_ada_make; ac_word=$2 1155-echo "$as_me:24183: checking for $ac_word" >&5 1156+for cf_prog_gnat in gnat gnatmake gprconfig gprbuild 1157+do 1158+ 1159+cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 1160+ 1161+ unset ac_cv_path_cf_TEMP_gnat 1162+ unset cf_TEMP_gnat 1163+ # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. 1164+set dummy $cf_prog_gnat; ac_word=$2 1165+echo "$as_me:24188: checking for $ac_word" >&5 1166 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1167-if test "${ac_cv_prog_gnatmake_exists+set}" = set; then 1168+if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then 1169 echo $ECHO_N "(cached) $ECHO_C" >&6 1170 else 1171- if test -n "$gnatmake_exists"; then 1172- ac_cv_prog_gnatmake_exists="$gnatmake_exists" # Let the user override the test. 1173-else 1174+ case $cf_TEMP_gnat in 1175+ [\\/]* | ?:[\\/]*) 1176+ ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path. 1177+ ;; 1178+ *) 1179 ac_save_IFS=$IFS; IFS=$ac_path_separator 1180 ac_dummy="$PATH" 1181 for ac_dir in $ac_dummy; do 1182 IFS=$ac_save_IFS 1183 test -z "$ac_dir" && ac_dir=. 1184- $as_executable_p "$ac_dir/$ac_word" || continue 1185-ac_cv_prog_gnatmake_exists="yes" 1186-echo "$as_me:24198: found $ac_dir/$ac_word" >&5 1187-break 1188+ if $as_executable_p "$ac_dir/$ac_word"; then 1189+ ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" 1190+ echo "$as_me:24205: found $ac_dir/$ac_word" >&5 1191+ break 1192+fi 1193 done 1194 1195- test -z "$ac_cv_prog_gnatmake_exists" && ac_cv_prog_gnatmake_exists="no" 1196-fi 1197+ test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no" 1198+ ;; 1199+esac 1200 fi 1201-gnatmake_exists=$ac_cv_prog_gnatmake_exists 1202-if test -n "$gnatmake_exists"; then 1203- echo "$as_me:24207: result: $gnatmake_exists" >&5 1204-echo "${ECHO_T}$gnatmake_exists" >&6 1205+cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat 1206+ 1207+if test -n "$cf_TEMP_gnat"; then 1208+ echo "$as_me:24217: result: $cf_TEMP_gnat" >&5 1209+echo "${ECHO_T}$cf_TEMP_gnat" >&6 1210 else 1211- echo "$as_me:24210: result: no" >&5 1212+ echo "$as_me:24220: result: no" >&5 1213 echo "${ECHO_T}no" >&6 1214 fi 1215 1216-if test "$ac_cv_prog_gnatmake_exists" = no; then 1217- cf_ada_make= 1218- cf_cv_prog_gnat_correct=no 1219-else 1220- # Extract the first word of "gprconfig", so it can be a program name with args. 1221-set dummy gprconfig; ac_word=$2 1222-echo "$as_me:24220: checking for $ac_word" >&5 1223-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1224-if test "${ac_cv_prog_gprconfig_exists+set}" = set; then 1225+ eval cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat 1226+ 1227+ if test "x$cf_TEMP_gnat" != xno; then 1228+ unset cf_gnat_version 1229+ unset cf_TEMP_gnat 1230+ 1231+echo "$as_me:24230: checking for $cf_prog_gnat version" >&5 1232+echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 1233+if test "${cf_gnat_version+set}" = set; then 1234 echo $ECHO_N "(cached) $ECHO_C" >&6 1235 else 1236- if test -n "$gprconfig_exists"; then 1237- ac_cv_prog_gprconfig_exists="$gprconfig_exists" # Let the user override the test. 1238-else 1239- ac_save_IFS=$IFS; IFS=$ac_path_separator 1240-ac_dummy="$PATH" 1241-for ac_dir in $ac_dummy; do 1242- IFS=$ac_save_IFS 1243- test -z "$ac_dir" && ac_dir=. 1244- $as_executable_p "$ac_dir/$ac_word" || continue 1245-ac_cv_prog_gprconfig_exists="yes" 1246-echo "$as_me:24235: found $ac_dir/$ac_word" >&5 1247-break 1248-done 1249 1250- test -z "$ac_cv_prog_gprconfig_exists" && ac_cv_prog_gprconfig_exists="no" 1251-fi 1252-fi 1253-gprconfig_exists=$ac_cv_prog_gprconfig_exists 1254-if test -n "$gprconfig_exists"; then 1255- echo "$as_me:24244: result: $gprconfig_exists" >&5 1256-echo "${ECHO_T}$gprconfig_exists" >&6 1257-else 1258- echo "$as_me:24247: result: no" >&5 1259-echo "${ECHO_T}no" >&6 1260+cf_gnat_version=`$cf_prog_gnat --version 2>&1 | \ 1261+ grep '[0-9].[0-9][0-9]*' |\ 1262+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` 1263+ 1264 fi 1265+echo "$as_me:24241: result: $cf_gnat_version" >&5 1266+echo "${ECHO_T}$cf_gnat_version" >&6 1267+test -z "$cf_gnat_version" && cf_gnat_version=no 1268+eval cf_TEMP_gnat=$cf_gnat_version; unset cf_gnat_version 1269 1270- if test "$ac_cv_prog_gprconfig_exists" = yes 1271- then 1272+ fi 1273+ eval cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat 1274+ 1275+ unset cf_TEMP_gnat 1276+ unset cf_gnat_version 1277+ unset ac_cv_path_cf_TEMP_gnat 1278+done 1279+ 1280+if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then 1281+ cf_ada_make= 1282+ cf_cv_prog_gnat_correct=no 1283+else 1284+ cf_ada_make=gnatmake 1285+ if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then 1286+ # gprconfig is newer than gnatmake; we can continue... 1287+ cf_ada_config="##" 1288+ else 1289 rm -rf conftest* *~conftest* 1290 if mkdir conftest.src 1291 then 1292@@ -24257,7 +24267,7 @@ 1293 cd conftest.src 1294 for cf_gprconfig in Ada C 1295 do 1296- echo "$as_me:24260: checking for gprconfig name for $cf_gprconfig" >&5 1297+ echo "$as_me:24270: checking for gprconfig name for $cf_gprconfig" >&5 1298 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 1299 if test $cf_gprconfig = C 1300 then 1301@@ -24276,10 +24286,10 @@ 1302 if test -n "$cf_gprconfig_value" 1303 then 1304 eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value 1305- echo "$as_me:24279: result: $cf_gprconfig_value" >&5 1306+ echo "$as_me:24289: result: $cf_gprconfig_value" >&5 1307 echo "${ECHO_T}$cf_gprconfig_value" >&6 1308 else 1309- echo "$as_me:24282: result: missing" >&5 1310+ echo "$as_me:24292: result: missing" >&5 1311 echo "${ECHO_T}missing" >&6 1312 cf_ada_config="#" 1313 break 1314@@ -24288,27 +24298,31 @@ 1315 cd .. 1316 rm -rf conftest* *~conftest* 1317 fi 1318- else 1319- # gprconfig is newer than gnatmake; we can continue... 1320- cf_ada_config="##" 1321 fi 1322 if test "x$cf_ada_config" != "x#" 1323 then 1324 1325-echo "$as_me:24298: checking for gnat version" >&5 1326+echo "$as_me:24305: checking for gnat version" >&5 1327 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 1328-cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ 1329+if test "${cf_gnat_version+set}" = set; then 1330+ echo $ECHO_N "(cached) $ECHO_C" >&6 1331+else 1332+ 1333+cf_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ 1334 grep '[0-9].[0-9][0-9]*' |\ 1335 sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` 1336-echo "$as_me:24303: result: $cf_gnat_version" >&5 1337+ 1338+fi 1339+echo "$as_me:24316: result: $cf_gnat_version" >&5 1340 echo "${ECHO_T}$cf_gnat_version" >&6 1341+test -z "$cf_gnat_version" && cf_gnat_version=no 1342 1343 case $cf_gnat_version in 1344 (3.1[1-9]*|3.[2-9]*|[4-9].*|20[0-9][0-9]) 1345 cf_cv_prog_gnat_correct=yes 1346 ;; 1347 (*) 1348- { echo "$as_me:24311: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 1349+ { echo "$as_me:24325: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 1350 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} 1351 cf_cv_prog_gnat_correct=no 1352 ;; 1353@@ -24316,7 +24330,7 @@ 1354 1355 # Extract the first word of "m4", so it can be a program name with args. 1356 set dummy m4; ac_word=$2 1357-echo "$as_me:24319: checking for $ac_word" >&5 1358+echo "$as_me:24333: checking for $ac_word" >&5 1359 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1360 if test "${ac_cv_prog_M4_exists+set}" = set; then 1361 echo $ECHO_N "(cached) $ECHO_C" >&6 1362@@ -24331,7 +24345,7 @@ 1363 test -z "$ac_dir" && ac_dir=. 1364 $as_executable_p "$ac_dir/$ac_word" || continue 1365 ac_cv_prog_M4_exists="yes" 1366-echo "$as_me:24334: found $ac_dir/$ac_word" >&5 1367+echo "$as_me:24348: found $ac_dir/$ac_word" >&5 1368 break 1369 done 1370 1371@@ -24340,19 +24354,20 @@ 1372 fi 1373 M4_exists=$ac_cv_prog_M4_exists 1374 if test -n "$M4_exists"; then 1375- echo "$as_me:24343: result: $M4_exists" >&5 1376+ echo "$as_me:24357: result: $M4_exists" >&5 1377 echo "${ECHO_T}$M4_exists" >&6 1378 else 1379- echo "$as_me:24346: result: no" >&5 1380+ echo "$as_me:24360: result: no" >&5 1381 echo "${ECHO_T}no" >&6 1382 fi 1383 1384 if test "$ac_cv_prog_M4_exists" = no; then 1385 cf_cv_prog_gnat_correct=no 1386- echo Ada95 binding required program m4 not found. Ada95 binding disabled. 1387+ { echo "$as_me:24366: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 1388+echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} 1389 fi 1390 if test "$cf_cv_prog_gnat_correct" = yes; then 1391- echo "$as_me:24355: checking if GNAT works" >&5 1392+ echo "$as_me:24370: checking if GNAT works" >&5 1393 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 1394 1395 rm -rf conftest* *~conftest* 1396@@ -24380,7 +24395,7 @@ 1397 fi 1398 rm -rf conftest* *~conftest* 1399 1400- echo "$as_me:24383: result: $cf_cv_prog_gnat_correct" >&5 1401+ echo "$as_me:24398: result: $cf_cv_prog_gnat_correct" >&5 1402 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 1403 fi 1404 else 1405@@ -24392,7 +24407,7 @@ 1406 1407 ADAFLAGS="$ADAFLAGS -gnatpn" 1408 1409- echo "$as_me:24395: checking optimization options for ADAFLAGS" >&5 1410+ echo "$as_me:24410: checking optimization options for ADAFLAGS" >&5 1411 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 1412 case "$CFLAGS" in 1413 (*-g*) 1414@@ -24409,10 +24424,10 @@ 1415 1416 ;; 1417 esac 1418- echo "$as_me:24412: result: $ADAFLAGS" >&5 1419+ echo "$as_me:24427: result: $ADAFLAGS" >&5 1420 echo "${ECHO_T}$ADAFLAGS" >&6 1421 1422-echo "$as_me:24415: checking if GNATPREP supports -T option" >&5 1423+echo "$as_me:24430: checking if GNATPREP supports -T option" >&5 1424 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 1425 if test "${cf_cv_gnatprep_opt_t+set}" = set; then 1426 echo $ECHO_N "(cached) $ECHO_C" >&6 1427@@ -24422,11 +24437,11 @@ 1428 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes 1429 1430 fi 1431-echo "$as_me:24425: result: $cf_cv_gnatprep_opt_t" >&5 1432+echo "$as_me:24440: result: $cf_cv_gnatprep_opt_t" >&5 1433 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 1434 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" 1435 1436-echo "$as_me:24429: checking if GNAT supports generics" >&5 1437+echo "$as_me:24444: checking if GNAT supports generics" >&5 1438 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 1439 case $cf_gnat_version in 1440 (3.[1-9]*|[4-9].*) 1441@@ -24436,7 +24451,7 @@ 1442 cf_gnat_generics=no 1443 ;; 1444 esac 1445-echo "$as_me:24439: result: $cf_gnat_generics" >&5 1446+echo "$as_me:24454: result: $cf_gnat_generics" >&5 1447 echo "${ECHO_T}$cf_gnat_generics" >&6 1448 1449 if test "$cf_gnat_generics" = yes 1450@@ -24448,7 +24463,7 @@ 1451 cf_generic_objects= 1452 fi 1453 1454-echo "$as_me:24451: checking if GNAT supports SIGINT" >&5 1455+echo "$as_me:24466: checking if GNAT supports SIGINT" >&5 1456 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 1457 if test "${cf_cv_gnat_sigint+set}" = set; then 1458 echo $ECHO_N "(cached) $ECHO_C" >&6 1459@@ -24496,7 +24511,7 @@ 1460 rm -rf conftest* *~conftest* 1461 1462 fi 1463-echo "$as_me:24499: result: $cf_cv_gnat_sigint" >&5 1464+echo "$as_me:24514: result: $cf_cv_gnat_sigint" >&5 1465 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 1466 1467 if test $cf_cv_gnat_sigint = yes ; then 1468@@ -24509,7 +24524,7 @@ 1469 cf_gnat_projects=no 1470 1471 if test "$enable_gnat_projects" != no ; then 1472-echo "$as_me:24512: checking if GNAT supports project files" >&5 1473+echo "$as_me:24527: checking if GNAT supports project files" >&5 1474 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 1475 case $cf_gnat_version in 1476 (3.[0-9]*) 1477@@ -24572,15 +24587,15 @@ 1478 esac 1479 ;; 1480 esac 1481-echo "$as_me:24575: result: $cf_gnat_projects" >&5 1482+echo "$as_me:24590: result: $cf_gnat_projects" >&5 1483 echo "${ECHO_T}$cf_gnat_projects" >&6 1484 fi # enable_gnat_projects 1485 1486 if test $cf_gnat_projects = yes 1487 then 1488- echo "$as_me:24581: checking if GNAT supports libraries" >&5 1489+ echo "$as_me:24596: checking if GNAT supports libraries" >&5 1490 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 1491- echo "$as_me:24583: result: $cf_gnat_libraries" >&5 1492+ echo "$as_me:24598: result: $cf_gnat_libraries" >&5 1493 echo "${ECHO_T}$cf_gnat_libraries" >&6 1494 fi 1495 1496@@ -24600,7 +24615,7 @@ 1497 USE_GNAT_LIBRARIES="#" 1498 fi 1499 1500-echo "$as_me:24603: checking for ada-compiler" >&5 1501+echo "$as_me:24618: checking for ada-compiler" >&5 1502 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 1503 1504 # Check whether --with-ada-compiler or --without-ada-compiler was given. 1505@@ -24611,12 +24626,12 @@ 1506 cf_ada_compiler=gnatmake 1507 fi; 1508 1509-echo "$as_me:24614: result: $cf_ada_compiler" >&5 1510+echo "$as_me:24629: result: $cf_ada_compiler" >&5 1511 echo "${ECHO_T}$cf_ada_compiler" >&6 1512 1513 cf_ada_package=terminal_interface 1514 1515-echo "$as_me:24619: checking for ada-include" >&5 1516+echo "$as_me:24634: checking for ada-include" >&5 1517 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 1518 1519 # Check whether --with-ada-include or --without-ada-include was given. 1520@@ -24652,7 +24667,7 @@ 1521 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 1522 ;; 1523 (*) 1524- { { echo "$as_me:24655: error: expected a pathname, not \"$withval\"" >&5 1525+ { { echo "$as_me:24670: error: expected a pathname, not \"$withval\"" >&5 1526 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 1527 { (exit 1); exit 1; }; } 1528 ;; 1529@@ -24661,10 +24676,10 @@ 1530 fi 1531 eval ADA_INCLUDE="$withval" 1532 1533-echo "$as_me:24664: result: $ADA_INCLUDE" >&5 1534+echo "$as_me:24679: result: $ADA_INCLUDE" >&5 1535 echo "${ECHO_T}$ADA_INCLUDE" >&6 1536 1537-echo "$as_me:24667: checking for ada-objects" >&5 1538+echo "$as_me:24682: checking for ada-objects" >&5 1539 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 1540 1541 # Check whether --with-ada-objects or --without-ada-objects was given. 1542@@ -24700,7 +24715,7 @@ 1543 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 1544 ;; 1545 (*) 1546- { { echo "$as_me:24703: error: expected a pathname, not \"$withval\"" >&5 1547+ { { echo "$as_me:24718: error: expected a pathname, not \"$withval\"" >&5 1548 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 1549 { (exit 1); exit 1; }; } 1550 ;; 1551@@ -24709,10 +24724,10 @@ 1552 fi 1553 eval ADA_OBJECTS="$withval" 1554 1555-echo "$as_me:24712: result: $ADA_OBJECTS" >&5 1556+echo "$as_me:24727: result: $ADA_OBJECTS" >&5 1557 echo "${ECHO_T}$ADA_OBJECTS" >&6 1558 1559-echo "$as_me:24715: checking if an Ada95 shared-library should be built" >&5 1560+echo "$as_me:24730: checking if an Ada95 shared-library should be built" >&5 1561 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 1562 1563 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. 1564@@ -24722,14 +24737,14 @@ 1565 else 1566 with_ada_sharedlib=no 1567 fi; 1568-echo "$as_me:24725: result: $with_ada_sharedlib" >&5 1569+echo "$as_me:24740: result: $with_ada_sharedlib" >&5 1570 echo "${ECHO_T}$with_ada_sharedlib" >&6 1571 1572 if test "x$with_ada_sharedlib" != xno 1573 then 1574 if test "x$cf_gnat_projects" != xyes 1575 then 1576- { echo "$as_me:24732: WARNING: disabling shared-library since GNAT projects are not supported" >&5 1577+ { echo "$as_me:24747: WARNING: disabling shared-library since GNAT projects are not supported" >&5 1578 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} 1579 with_ada_sharedlib=no 1580 fi 1581@@ -24749,7 +24764,7 @@ 1582 1583 # allow the Ada binding to be renamed 1584 1585-echo "$as_me:24752: checking for ada-libname" >&5 1586+echo "$as_me:24767: checking for ada-libname" >&5 1587 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 1588 1589 # Check whether --with-ada-libname or --without-ada-libname was given. 1590@@ -24765,7 +24780,7 @@ 1591 ;; 1592 esac 1593 1594-echo "$as_me:24768: result: $ADA_LIBNAME" >&5 1595+echo "$as_me:24783: result: $ADA_LIBNAME" >&5 1596 echo "${ECHO_T}$ADA_LIBNAME" >&6 1597 1598 fi 1599@@ -24776,13 +24791,13 @@ 1600 1601 # do this "late" to avoid conflict with header-checks 1602 if test "x$with_widec" = xyes ; then 1603- echo "$as_me:24779: checking for wchar_t" >&5 1604+ echo "$as_me:24794: checking for wchar_t" >&5 1605 echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 1606 if test "${ac_cv_type_wchar_t+set}" = set; then 1607 echo $ECHO_N "(cached) $ECHO_C" >&6 1608 else 1609 cat >conftest.$ac_ext <<_ACEOF 1610-#line 24785 "configure" 1611+#line 24800 "configure" 1612 #include "confdefs.h" 1613 $ac_includes_default 1614 int 1615@@ -24797,16 +24812,16 @@ 1616 } 1617 _ACEOF 1618 rm -f conftest.$ac_objext 1619-if { (eval echo "$as_me:24800: \"$ac_compile\"") >&5 1620+if { (eval echo "$as_me:24815: \"$ac_compile\"") >&5 1621 (eval $ac_compile) 2>&5 1622 ac_status=$? 1623- echo "$as_me:24803: \$? = $ac_status" >&5 1624+ echo "$as_me:24818: \$? = $ac_status" >&5 1625 (exit $ac_status); } && 1626 { ac_try='test -s conftest.$ac_objext' 1627- { (eval echo "$as_me:24806: \"$ac_try\"") >&5 1628+ { (eval echo "$as_me:24821: \"$ac_try\"") >&5 1629 (eval $ac_try) 2>&5 1630 ac_status=$? 1631- echo "$as_me:24809: \$? = $ac_status" >&5 1632+ echo "$as_me:24824: \$? = $ac_status" >&5 1633 (exit $ac_status); }; }; then 1634 ac_cv_type_wchar_t=yes 1635 else 1636@@ -24816,10 +24831,10 @@ 1637 fi 1638 rm -f conftest.$ac_objext conftest.$ac_ext 1639 fi 1640-echo "$as_me:24819: result: $ac_cv_type_wchar_t" >&5 1641+echo "$as_me:24834: result: $ac_cv_type_wchar_t" >&5 1642 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 1643 1644-echo "$as_me:24822: checking size of wchar_t" >&5 1645+echo "$as_me:24837: checking size of wchar_t" >&5 1646 echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 1647 if test "${ac_cv_sizeof_wchar_t+set}" = set; then 1648 echo $ECHO_N "(cached) $ECHO_C" >&6 1649@@ -24828,7 +24843,7 @@ 1650 if test "$cross_compiling" = yes; then 1651 # Depending upon the size, compute the lo and hi bounds. 1652 cat >conftest.$ac_ext <<_ACEOF 1653-#line 24831 "configure" 1654+#line 24846 "configure" 1655 #include "confdefs.h" 1656 $ac_includes_default 1657 int 1658@@ -24840,21 +24855,21 @@ 1659 } 1660 _ACEOF 1661 rm -f conftest.$ac_objext 1662-if { (eval echo "$as_me:24843: \"$ac_compile\"") >&5 1663+if { (eval echo "$as_me:24858: \"$ac_compile\"") >&5 1664 (eval $ac_compile) 2>&5 1665 ac_status=$? 1666- echo "$as_me:24846: \$? = $ac_status" >&5 1667+ echo "$as_me:24861: \$? = $ac_status" >&5 1668 (exit $ac_status); } && 1669 { ac_try='test -s conftest.$ac_objext' 1670- { (eval echo "$as_me:24849: \"$ac_try\"") >&5 1671+ { (eval echo "$as_me:24864: \"$ac_try\"") >&5 1672 (eval $ac_try) 2>&5 1673 ac_status=$? 1674- echo "$as_me:24852: \$? = $ac_status" >&5 1675+ echo "$as_me:24867: \$? = $ac_status" >&5 1676 (exit $ac_status); }; }; then 1677 ac_lo=0 ac_mid=0 1678 while :; do 1679 cat >conftest.$ac_ext <<_ACEOF 1680-#line 24857 "configure" 1681+#line 24872 "configure" 1682 #include "confdefs.h" 1683 $ac_includes_default 1684 int 1685@@ -24866,16 +24881,16 @@ 1686 } 1687 _ACEOF 1688 rm -f conftest.$ac_objext 1689-if { (eval echo "$as_me:24869: \"$ac_compile\"") >&5 1690+if { (eval echo "$as_me:24884: \"$ac_compile\"") >&5 1691 (eval $ac_compile) 2>&5 1692 ac_status=$? 1693- echo "$as_me:24872: \$? = $ac_status" >&5 1694+ echo "$as_me:24887: \$? = $ac_status" >&5 1695 (exit $ac_status); } && 1696 { ac_try='test -s conftest.$ac_objext' 1697- { (eval echo "$as_me:24875: \"$ac_try\"") >&5 1698+ { (eval echo "$as_me:24890: \"$ac_try\"") >&5 1699 (eval $ac_try) 2>&5 1700 ac_status=$? 1701- echo "$as_me:24878: \$? = $ac_status" >&5 1702+ echo "$as_me:24893: \$? = $ac_status" >&5 1703 (exit $ac_status); }; }; then 1704 ac_hi=$ac_mid; break 1705 else 1706@@ -24891,7 +24906,7 @@ 1707 ac_hi=-1 ac_mid=-1 1708 while :; do 1709 cat >conftest.$ac_ext <<_ACEOF 1710-#line 24894 "configure" 1711+#line 24909 "configure" 1712 #include "confdefs.h" 1713 $ac_includes_default 1714 int 1715@@ -24903,16 +24918,16 @@ 1716 } 1717 _ACEOF 1718 rm -f conftest.$ac_objext 1719-if { (eval echo "$as_me:24906: \"$ac_compile\"") >&5 1720+if { (eval echo "$as_me:24921: \"$ac_compile\"") >&5 1721 (eval $ac_compile) 2>&5 1722 ac_status=$? 1723- echo "$as_me:24909: \$? = $ac_status" >&5 1724+ echo "$as_me:24924: \$? = $ac_status" >&5 1725 (exit $ac_status); } && 1726 { ac_try='test -s conftest.$ac_objext' 1727- { (eval echo "$as_me:24912: \"$ac_try\"") >&5 1728+ { (eval echo "$as_me:24927: \"$ac_try\"") >&5 1729 (eval $ac_try) 2>&5 1730 ac_status=$? 1731- echo "$as_me:24915: \$? = $ac_status" >&5 1732+ echo "$as_me:24930: \$? = $ac_status" >&5 1733 (exit $ac_status); }; }; then 1734 ac_lo=$ac_mid; break 1735 else 1736@@ -24928,7 +24943,7 @@ 1737 while test "x$ac_lo" != "x$ac_hi"; do 1738 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 1739 cat >conftest.$ac_ext <<_ACEOF 1740-#line 24931 "configure" 1741+#line 24946 "configure" 1742 #include "confdefs.h" 1743 $ac_includes_default 1744 int 1745@@ -24940,16 +24955,16 @@ 1746 } 1747 _ACEOF 1748 rm -f conftest.$ac_objext 1749-if { (eval echo "$as_me:24943: \"$ac_compile\"") >&5 1750+if { (eval echo "$as_me:24958: \"$ac_compile\"") >&5 1751 (eval $ac_compile) 2>&5 1752 ac_status=$? 1753- echo "$as_me:24946: \$? = $ac_status" >&5 1754+ echo "$as_me:24961: \$? = $ac_status" >&5 1755 (exit $ac_status); } && 1756 { ac_try='test -s conftest.$ac_objext' 1757- { (eval echo "$as_me:24949: \"$ac_try\"") >&5 1758+ { (eval echo "$as_me:24964: \"$ac_try\"") >&5 1759 (eval $ac_try) 2>&5 1760 ac_status=$? 1761- echo "$as_me:24952: \$? = $ac_status" >&5 1762+ echo "$as_me:24967: \$? = $ac_status" >&5 1763 (exit $ac_status); }; }; then 1764 ac_hi=$ac_mid 1765 else 1766@@ -24962,12 +24977,12 @@ 1767 ac_cv_sizeof_wchar_t=$ac_lo 1768 else 1769 if test "$cross_compiling" = yes; then 1770- { { echo "$as_me:24965: error: cannot run test program while cross compiling" >&5 1771+ { { echo "$as_me:24980: error: cannot run test program while cross compiling" >&5 1772 echo "$as_me: error: cannot run test program while cross compiling" >&2;} 1773 { (exit 1); exit 1; }; } 1774 else 1775 cat >conftest.$ac_ext <<_ACEOF 1776-#line 24970 "configure" 1777+#line 24985 "configure" 1778 #include "confdefs.h" 1779 $ac_includes_default 1780 int 1781@@ -24983,15 +24998,15 @@ 1782 } 1783 _ACEOF 1784 rm -f conftest$ac_exeext 1785-if { (eval echo "$as_me:24986: \"$ac_link\"") >&5 1786+if { (eval echo "$as_me:25001: \"$ac_link\"") >&5 1787 (eval $ac_link) 2>&5 1788 ac_status=$? 1789- echo "$as_me:24989: \$? = $ac_status" >&5 1790+ echo "$as_me:25004: \$? = $ac_status" >&5 1791 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 1792- { (eval echo "$as_me:24991: \"$ac_try\"") >&5 1793+ { (eval echo "$as_me:25006: \"$ac_try\"") >&5 1794 (eval $ac_try) 2>&5 1795 ac_status=$? 1796- echo "$as_me:24994: \$? = $ac_status" >&5 1797+ echo "$as_me:25009: \$? = $ac_status" >&5 1798 (exit $ac_status); }; }; then 1799 ac_cv_sizeof_wchar_t=`cat conftest.val` 1800 else 1801@@ -25007,7 +25022,7 @@ 1802 ac_cv_sizeof_wchar_t=0 1803 fi 1804 fi 1805-echo "$as_me:25010: result: $ac_cv_sizeof_wchar_t" >&5 1806+echo "$as_me:25025: result: $ac_cv_sizeof_wchar_t" >&5 1807 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 1808 cat >>confdefs.h <<EOF 1809 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t 1810@@ -25025,7 +25040,7 @@ 1811 ### chooses to split module lists into libraries. 1812 ### 1813 ### (see CF_LIB_RULES). 1814-echo "$as_me:25028: checking for library subsets" >&5 1815+echo "$as_me:25043: checking for library subsets" >&5 1816 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 1817 LIB_SUBSETS= 1818 1819@@ -25067,7 +25082,7 @@ 1820 test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" 1821 test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" 1822 1823-echo "$as_me:25070: result: $LIB_SUBSETS" >&5 1824+echo "$as_me:25085: result: $LIB_SUBSETS" >&5 1825 echo "${ECHO_T}$LIB_SUBSETS" >&6 1826 1827 ### Construct the list of include-directories to be generated 1828@@ -25098,7 +25113,7 @@ 1829 fi 1830 1831 ### Build up pieces for makefile rules 1832-echo "$as_me:25101: checking default library suffix" >&5 1833+echo "$as_me:25116: checking default library suffix" >&5 1834 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 1835 1836 case $DFT_LWR_MODEL in 1837@@ -25109,10 +25124,10 @@ 1838 (shared) DFT_ARG_SUFFIX='' ;; 1839 esac 1840 test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" 1841-echo "$as_me:25112: result: $DFT_ARG_SUFFIX" >&5 1842+echo "$as_me:25127: result: $DFT_ARG_SUFFIX" >&5 1843 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 1844 1845-echo "$as_me:25115: checking default library-dependency suffix" >&5 1846+echo "$as_me:25130: checking default library-dependency suffix" >&5 1847 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 1848 1849 case X$DFT_LWR_MODEL in 1850@@ -25170,10 +25185,10 @@ 1851 DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" 1852 DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" 1853 fi 1854-echo "$as_me:25173: result: $DFT_DEP_SUFFIX" >&5 1855+echo "$as_me:25188: result: $DFT_DEP_SUFFIX" >&5 1856 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 1857 1858-echo "$as_me:25176: checking default object directory" >&5 1859+echo "$as_me:25191: checking default object directory" >&5 1860 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 1861 1862 case $DFT_LWR_MODEL in 1863@@ -25189,11 +25204,11 @@ 1864 DFT_OBJ_SUBDIR='obj_s' ;; 1865 esac 1866 esac 1867-echo "$as_me:25192: result: $DFT_OBJ_SUBDIR" >&5 1868+echo "$as_me:25207: result: $DFT_OBJ_SUBDIR" >&5 1869 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 1870 1871 if test "x$cf_with_cxx" = xyes ; then 1872-echo "$as_me:25196: checking c++ library-dependency suffix" >&5 1873+echo "$as_me:25211: checking c++ library-dependency suffix" >&5 1874 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 1875 if test "$with_libtool" != "no"; then 1876 # libtool thinks it can make c++ shared libraries (perhaps only g++) 1877@@ -25261,7 +25276,7 @@ 1878 fi 1879 1880 fi 1881-echo "$as_me:25264: result: $CXX_LIB_SUFFIX" >&5 1882+echo "$as_me:25279: result: $CXX_LIB_SUFFIX" >&5 1883 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 1884 1885 fi 1886@@ -25437,19 +25452,19 @@ 1887 1888 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" 1889 then 1890- echo "$as_me:25440: checking if linker supports switching between static/dynamic" >&5 1891+ echo "$as_me:25455: checking if linker supports switching between static/dynamic" >&5 1892 echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 1893 1894 rm -f libconftest.a 1895 cat >conftest.$ac_ext <<EOF 1896-#line 25445 "configure" 1897+#line 25460 "configure" 1898 #include <stdio.h> 1899 int cf_ldflags_static(FILE *fp) { return fflush(fp); } 1900 EOF 1901- if { (eval echo "$as_me:25449: \"$ac_compile\"") >&5 1902+ if { (eval echo "$as_me:25464: \"$ac_compile\"") >&5 1903 (eval $ac_compile) 2>&5 1904 ac_status=$? 1905- echo "$as_me:25452: \$? = $ac_status" >&5 1906+ echo "$as_me:25467: \$? = $ac_status" >&5 1907 (exit $ac_status); } ; then 1908 ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null 1909 ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null 1910@@ -25460,10 +25475,10 @@ 1911 1912 LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" 1913 cat >conftest.$ac_ext <<_ACEOF 1914-#line 25463 "configure" 1915+#line 25478 "configure" 1916 #include "confdefs.h" 1917 1918-#line 25466 "configure" 1919+#line 25481 "configure" 1920 #include <stdio.h> 1921 int cf_ldflags_static(FILE *fp); 1922 1923@@ -25478,16 +25493,16 @@ 1924 } 1925 _ACEOF 1926 rm -f conftest.$ac_objext conftest$ac_exeext 1927-if { (eval echo "$as_me:25481: \"$ac_link\"") >&5 1928+if { (eval echo "$as_me:25496: \"$ac_link\"") >&5 1929 (eval $ac_link) 2>&5 1930 ac_status=$? 1931- echo "$as_me:25484: \$? = $ac_status" >&5 1932+ echo "$as_me:25499: \$? = $ac_status" >&5 1933 (exit $ac_status); } && 1934 { ac_try='test -s conftest$ac_exeext' 1935- { (eval echo "$as_me:25487: \"$ac_try\"") >&5 1936+ { (eval echo "$as_me:25502: \"$ac_try\"") >&5 1937 (eval $ac_try) 2>&5 1938 ac_status=$? 1939- echo "$as_me:25490: \$? = $ac_status" >&5 1940+ echo "$as_me:25505: \$? = $ac_status" >&5 1941 (exit $ac_status); }; }; then 1942 1943 # some linkers simply ignore the -dynamic 1944@@ -25510,7 +25525,7 @@ 1945 rm -f libconftest.* 1946 LIBS="$cf_save_LIBS" 1947 1948- echo "$as_me:25513: result: $cf_ldflags_static" >&5 1949+ echo "$as_me:25528: result: $cf_ldflags_static" >&5 1950 echo "${ECHO_T}$cf_ldflags_static" >&6 1951 1952 if test $cf_ldflags_static != yes 1953@@ -25526,7 +25541,7 @@ 1954 ;; 1955 esac 1956 1957-echo "$as_me:25529: checking where we will install curses.h" >&5 1958+echo "$as_me:25544: checking where we will install curses.h" >&5 1959 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 1960 1961 includesubdir= 1962@@ -25536,7 +25551,7 @@ 1963 then 1964 includesubdir="/ncurses${USE_LIB_SUFFIX}" 1965 fi 1966-echo "$as_me:25539: result: ${includedir}${includesubdir}" >&5 1967+echo "$as_me:25554: result: ${includedir}${includesubdir}" >&5 1968 echo "${ECHO_T}${includedir}${includesubdir}" >&6 1969 1970 ### Resolve a conflict between normal and wide-curses by forcing applications 1971@@ -25544,7 +25559,7 @@ 1972 if test "$with_overwrite" != no ; then 1973 if test "$NCURSES_LIBUTF8" = 1 ; then 1974 NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' 1975- { echo "$as_me:25547: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 1976+ { echo "$as_me:25562: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 1977 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} 1978 fi 1979 fi 1980@@ -25562,7 +25577,7 @@ 1981 ### Construct the list of subdirectories for which we'll customize makefiles 1982 ### with the appropriate compile-rules. 1983 1984-echo "$as_me:25565: checking for src modules" >&5 1985+echo "$as_me:25580: checking for src modules" >&5 1986 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 1987 1988 # dependencies and linker-arguments for test-programs 1989@@ -25627,7 +25642,7 @@ 1990 fi 1991 fi 1992 done 1993-echo "$as_me:25630: result: $cf_cv_src_modules" >&5 1994+echo "$as_me:25645: result: $cf_cv_src_modules" >&5 1995 echo "${ECHO_T}$cf_cv_src_modules" >&6 1996 1997 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" 1998@@ -25894,7 +25909,7 @@ 1999 (*-D_XOPEN_SOURCE_EXTENDED*) 2000 test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 2001 2002-echo "${as_me:-configure}:25897: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 2003+echo "${as_me:-configure}:25912: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 2004 2005 CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" 2006 CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` 2007@@ -25905,7 +25920,7 @@ 2008 2009 # Help to automatically enable the extended curses features when using either 2010 # the *-config or the ".pc" files by adding defines. 2011-echo "$as_me:25908: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 2012+echo "$as_me:25923: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 2013 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6 2014 PKG_CFLAGS= 2015 for cf_loop1 in $CPPFLAGS_after_XOPEN 2016@@ -25921,7 +25936,7 @@ 2017 done 2018 test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" 2019 done 2020-echo "$as_me:25924: result: $PKG_CFLAGS" >&5 2021+echo "$as_me:25939: result: $PKG_CFLAGS" >&5 2022 echo "${ECHO_T}$PKG_CFLAGS" >&6 2023 2024 # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. 2025@@ -25982,7 +25997,7 @@ 2026 cf_filter_syms=$cf_dft_filter_syms 2027 test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_version" 1>&6 2028 2029-echo "${as_me:-configure}:25985: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 2030+echo "${as_me:-configure}:26000: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 2031 2032 fi 2033 2034@@ -26092,7 +26107,7 @@ 2035 : ${CONFIG_STATUS=./config.status} 2036 ac_clean_files_save=$ac_clean_files 2037 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 2038-{ echo "$as_me:26095: creating $CONFIG_STATUS" >&5 2039+{ echo "$as_me:26110: creating $CONFIG_STATUS" >&5 2040 echo "$as_me: creating $CONFIG_STATUS" >&6;} 2041 cat >$CONFIG_STATUS <<_ACEOF 2042 #! $SHELL 2043@@ -26268,7 +26283,7 @@ 2044 echo "$ac_cs_version"; exit 0 ;; 2045 --he | --h) 2046 # Conflict between --help and --header 2047- { { echo "$as_me:26271: error: ambiguous option: $1 2048+ { { echo "$as_me:26286: error: ambiguous option: $1 2049 Try \`$0 --help' for more information." >&5 2050 echo "$as_me: error: ambiguous option: $1 2051 Try \`$0 --help' for more information." >&2;} 2052@@ -26287,7 +26302,7 @@ 2053 ac_need_defaults=false;; 2054 2055 # This is an error. 2056- -*) { { echo "$as_me:26290: error: unrecognized option: $1 2057+ -*) { { echo "$as_me:26305: error: unrecognized option: $1 2058 Try \`$0 --help' for more information." >&5 2059 echo "$as_me: error: unrecognized option: $1 2060 Try \`$0 --help' for more information." >&2;} 2061@@ -26406,7 +26421,7 @@ 2062 "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; 2063 "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 2064 "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; 2065- *) { { echo "$as_me:26409: error: invalid argument: $ac_config_target" >&5 2066+ *) { { echo "$as_me:26424: error: invalid argument: $ac_config_target" >&5 2067 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} 2068 { (exit 1); exit 1; }; };; 2069 esac 2070@@ -26694,8 +26709,7 @@ 2071 s,@CXX_ARFLAGS@,$CXX_ARFLAGS,;t t 2072 s,@CXXLIBS@,$CXXLIBS,;t t 2073 s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t 2074-s,@gnatmake_exists@,$gnatmake_exists,;t t 2075-s,@gprconfig_exists@,$gprconfig_exists,;t t 2076+s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t 2077 s,@M4_exists@,$M4_exists,;t t 2078 s,@cf_ada_make@,$cf_ada_make,;t t 2079 s,@cf_ada_config@,$cf_ada_config,;t t 2080@@ -26902,7 +26916,7 @@ 2081 esac 2082 2083 if test x"$ac_file" != x-; then 2084- { echo "$as_me:26905: creating $ac_file" >&5 2085+ { echo "$as_me:26919: creating $ac_file" >&5 2086 echo "$as_me: creating $ac_file" >&6;} 2087 rm -f "$ac_file" 2088 fi 2089@@ -26920,7 +26934,7 @@ 2090 -) echo $tmp/stdin ;; 2091 [\\/$]*) 2092 # Absolute (can't be DOS-style, as IFS=:) 2093- test -f "$f" || { { echo "$as_me:26923: error: cannot find input file: $f" >&5 2094+ test -f "$f" || { { echo "$as_me:26937: error: cannot find input file: $f" >&5 2095 echo "$as_me: error: cannot find input file: $f" >&2;} 2096 { (exit 1); exit 1; }; } 2097 echo $f;; 2098@@ -26933,7 +26947,7 @@ 2099 echo $srcdir/$f 2100 else 2101 # /dev/null tree 2102- { { echo "$as_me:26936: error: cannot find input file: $f" >&5 2103+ { { echo "$as_me:26950: error: cannot find input file: $f" >&5 2104 echo "$as_me: error: cannot find input file: $f" >&2;} 2105 { (exit 1); exit 1; }; } 2106 fi;; 2107@@ -26949,7 +26963,7 @@ 2108 if test -n "$ac_seen"; then 2109 ac_used=`grep '@datarootdir@' $ac_item` 2110 if test -z "$ac_used"; then 2111- { echo "$as_me:26952: WARNING: datarootdir was used implicitly but not set: 2112+ { echo "$as_me:26966: WARNING: datarootdir was used implicitly but not set: 2113 $ac_seen" >&5 2114 echo "$as_me: WARNING: datarootdir was used implicitly but not set: 2115 $ac_seen" >&2;} 2116@@ -26958,7 +26972,7 @@ 2117 fi 2118 ac_seen=`grep '${datarootdir}' $ac_item` 2119 if test -n "$ac_seen"; then 2120- { echo "$as_me:26961: WARNING: datarootdir was used explicitly but not set: 2121+ { echo "$as_me:26975: WARNING: datarootdir was used explicitly but not set: 2122 $ac_seen" >&5 2123 echo "$as_me: WARNING: datarootdir was used explicitly but not set: 2124 $ac_seen" >&2;} 2125@@ -26995,7 +27009,7 @@ 2126 ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` 2127 if test -z "$ac_init"; then 2128 ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` 2129- { echo "$as_me:26998: WARNING: Variable $ac_name is used but was not set: 2130+ { echo "$as_me:27012: WARNING: Variable $ac_name is used but was not set: 2131 $ac_seen" >&5 2132 echo "$as_me: WARNING: Variable $ac_name is used but was not set: 2133 $ac_seen" >&2;} 2134@@ -27006,7 +27020,7 @@ 2135 egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out 2136 if test -s $tmp/out; then 2137 ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` 2138- { echo "$as_me:27009: WARNING: Some variables may not be substituted: 2139+ { echo "$as_me:27023: WARNING: Some variables may not be substituted: 2140 $ac_seen" >&5 2141 echo "$as_me: WARNING: Some variables may not be substituted: 2142 $ac_seen" >&2;} 2143@@ -27055,7 +27069,7 @@ 2144 * ) ac_file_in=$ac_file.in ;; 2145 esac 2146 2147- test x"$ac_file" != x- && { echo "$as_me:27058: creating $ac_file" >&5 2148+ test x"$ac_file" != x- && { echo "$as_me:27072: creating $ac_file" >&5 2149 echo "$as_me: creating $ac_file" >&6;} 2150 2151 # First look for the input files in the build tree, otherwise in the 2152@@ -27066,7 +27080,7 @@ 2153 -) echo $tmp/stdin ;; 2154 [\\/$]*) 2155 # Absolute (can't be DOS-style, as IFS=:) 2156- test -f "$f" || { { echo "$as_me:27069: error: cannot find input file: $f" >&5 2157+ test -f "$f" || { { echo "$as_me:27083: error: cannot find input file: $f" >&5 2158 echo "$as_me: error: cannot find input file: $f" >&2;} 2159 { (exit 1); exit 1; }; } 2160 echo $f;; 2161@@ -27079,7 +27093,7 @@ 2162 echo $srcdir/$f 2163 else 2164 # /dev/null tree 2165- { { echo "$as_me:27082: error: cannot find input file: $f" >&5 2166+ { { echo "$as_me:27096: error: cannot find input file: $f" >&5 2167 echo "$as_me: error: cannot find input file: $f" >&2;} 2168 { (exit 1); exit 1; }; } 2169 fi;; 2170@@ -27137,7 +27151,7 @@ 2171 rm -f $tmp/in 2172 if test x"$ac_file" != x-; then 2173 if cmp -s $ac_file $tmp/config.h 2>/dev/null; then 2174- { echo "$as_me:27140: $ac_file is unchanged" >&5 2175+ { echo "$as_me:27154: $ac_file is unchanged" >&5 2176 echo "$as_me: $ac_file is unchanged" >&6;} 2177 else 2178 ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 2179@@ -27482,7 +27496,7 @@ 2180 (cygdll|msysdll|mingw) 2181 test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 2182 2183-echo "${as_me:-configure}:27485: testing overriding CXX_MODEL to SHARED ..." 1>&5 2184+echo "${as_me:-configure}:27499: testing overriding CXX_MODEL to SHARED ..." 1>&5 2185 2186 with_shared_cxx=yes 2187 ;; 2188Index: dist.mk 2189Prereq: 1.1305 2190--- ncurses-6.1-20190914+/dist.mk 2019-09-14 13:43:52.000000000 +0000 2191+++ ncurses-6.1-20190921/dist.mk 2019-09-21 14:56:20.000000000 +0000 2192@@ -25,7 +25,7 @@ 2193 # use or other dealings in this Software without prior written # 2194 # authorization. # 2195 ############################################################################## 2196-# $Id: dist.mk,v 1.1305 2019/09/14 13:43:52 tom Exp $ 2197+# $Id: dist.mk,v 1.1306 2019/09/21 14:56:20 tom Exp $ 2198 # Makefile for creating ncurses distributions. 2199 # 2200 # This only needs to be used directly as a makefile by developers, but 2201@@ -37,7 +37,7 @@ 2202 # These define the major/minor/patch versions of ncurses. 2203 NCURSES_MAJOR = 6 2204 NCURSES_MINOR = 1 2205-NCURSES_PATCH = 20190914 2206+NCURSES_PATCH = 20190921 2207 2208 # We don't append the patch to the version, since this only applies to releases 2209 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) 2210Index: doc/html/man/adacurses6-config.1.html 2211--- ncurses-6.1-20190914+/doc/html/man/adacurses6-config.1.html 2019-07-26 23:48:24.000000000 +0000 2212+++ ncurses-6.1-20190921/doc/html/man/adacurses6-config.1.html 2019-09-21 23:49:50.000000000 +0000 2213@@ -1,6 +1,6 @@ 2214 <!-- 2215 **************************************************************************** 2216- * Copyright (c) 2010-2014,2016 Free Software Foundation, Inc. * 2217+ * Copyright (c) 2010-2016,2019 Free Software Foundation, Inc. * 2218 * * 2219 * Permission is hereby granted, free of charge, to any person obtaining a * 2220 * copy of this software and associated documentation files (the * 2221@@ -26,7 +26,7 @@ 2222 * sale, use or other dealings in this Software without prior written * 2223 * authorization. * 2224 **************************************************************************** 2225- * @Id: MKada_config.in,v 1.10 2016/11/05 21:08:21 tom Exp @ 2226+ * @Id: MKada_config.in,v 1.11 2019/09/07 20:22:51 tom Exp @ 2227 --> 2228 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> 2229 <HTML> 2230@@ -125,7 +125,7 @@ 2231 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 2232 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> 2233 2234- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190727). 2235+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190921). 2236 2237 2238 2239Index: doc/html/man/captoinfo.1m.html 2240--- ncurses-6.1-20190914+/doc/html/man/captoinfo.1m.html 2019-07-26 23:48:24.000000000 +0000 2241+++ ncurses-6.1-20190921/doc/html/man/captoinfo.1m.html 2019-09-21 23:49:50.000000000 +0000 2242@@ -190,7 +190,7 @@ 2243 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 2244 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> 2245 2246- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190727). 2247+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190921). 2248 2249 2250 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> 2251Index: doc/html/man/clear.1.html 2252--- ncurses-6.1-20190914+/doc/html/man/clear.1.html 2019-07-26 23:48:24.000000000 +0000 2253+++ ncurses-6.1-20190921/doc/html/man/clear.1.html 2019-09-21 23:49:50.000000000 +0000 2254@@ -148,7 +148,7 @@ 2255 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 2256 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> 2257 2258- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190727). 2259+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190921). 2260 2261 2262 2263Index: doc/html/man/form.3x.html 2264--- ncurses-6.1-20190914+/doc/html/man/form.3x.html 2019-07-26 23:48:27.000000000 +0000 2265+++ ncurses-6.1-20190921/doc/html/man/form.3x.html 2019-09-21 23:49:52.000000000 +0000 2266@@ -246,7 +246,7 @@ 2267 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for detailed 2268 descriptions of the entry points. 2269 2270- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190727). 2271+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190921). 2272 2273 2274 2275Index: doc/html/man/infocmp.1m.html 2276--- ncurses-6.1-20190914+/doc/html/man/infocmp.1m.html 2019-07-26 23:48:28.000000000 +0000 2277+++ ncurses-6.1-20190921/doc/html/man/infocmp.1m.html 2019-09-21 23:49:52.000000000 +0000 2278@@ -512,7 +512,7 @@ 2279 2280 https://invisible-island.net/ncurses/tctest.html 2281 2282- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190727). 2283+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190921). 2284 2285 2286 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> 2287Index: doc/html/man/infotocap.1m.html 2288--- ncurses-6.1-20190914+/doc/html/man/infotocap.1m.html 2019-07-26 23:48:28.000000000 +0000 2289+++ ncurses-6.1-20190921/doc/html/man/infotocap.1m.html 2019-09-21 23:49:52.000000000 +0000 2290@@ -85,7 +85,7 @@ 2291 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 2292 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> 2293 2294- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190727). 2295+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190921). 2296 2297 2298 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> 2299Index: doc/html/man/menu.3x.html 2300--- ncurses-6.1-20190914+/doc/html/man/menu.3x.html 2019-07-26 23:48:28.000000000 +0000 2301+++ ncurses-6.1-20190921/doc/html/man/menu.3x.html 2019-09-21 23:49:53.000000000 +0000 2302@@ -221,7 +221,7 @@ 2303 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for detailed 2304 descriptions of the entry points. 2305 2306- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190727). 2307+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190921). 2308 2309 2310 2311Index: doc/html/man/ncurses.3x.html 2312--- ncurses-6.1-20190914+/doc/html/man/ncurses.3x.html 2019-07-26 23:48:29.000000000 +0000 2313+++ ncurses-6.1-20190921/doc/html/man/ncurses.3x.html 2019-09-21 23:49:53.000000000 +0000 2314@@ -59,7 +59,7 @@ 2315 method of updating character screens with reasonable optimization. 2316 This implementation is "new curses" (ncurses) and is the approved 2317 replacement for 4.4BSD classic curses, which has been discontinued. 2318- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190727). 2319+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190921). 2320 2321 The <STRONG>ncurses</STRONG> library emulates the curses library of System V Release 4 2322 UNIX, and XPG4 (X/Open Portability Guide) curses (also known as XSI 2323Index: doc/html/man/ncurses6-config.1.html 2324--- ncurses-6.1-20190914+/doc/html/man/ncurses6-config.1.html 2019-07-26 23:48:29.000000000 +0000 2325+++ ncurses-6.1-20190921/doc/html/man/ncurses6-config.1.html 2019-09-21 23:49:53.000000000 +0000 2326@@ -112,7 +112,7 @@ 2327 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 2328 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> 2329 2330- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190727). 2331+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190921). 2332 2333 2334 2335Index: doc/html/man/panel.3x.html 2336--- ncurses-6.1-20190914+/doc/html/man/panel.3x.html 2019-07-26 23:48:29.000000000 +0000 2337+++ ncurses-6.1-20190921/doc/html/man/panel.3x.html 2019-09-21 23:49:54.000000000 +0000 2338@@ -204,7 +204,7 @@ 2339 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 2340 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, 2341 2342- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190727). 2343+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190921). 2344 2345 2346 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> 2347Index: doc/html/man/resizeterm.3x.html 2348--- ncurses-6.1-20190914+/doc/html/man/resizeterm.3x.html 2019-03-16 19:34:46.000000000 +0000 2349+++ ncurses-6.1-20190921/doc/html/man/resizeterm.3x.html 2019-09-21 23:49:54.000000000 +0000 2350@@ -1,6 +1,6 @@ 2351 <!-- 2352 **************************************************************************** 2353- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * 2354+ * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * 2355 * * 2356 * Permission is hereby granted, free of charge, to any person obtaining a * 2357 * copy of this software and associated documentation files (the * 2358@@ -27,7 +27,7 @@ 2359 * authorization. * 2360 **************************************************************************** 2361 * Author: Thomas E. Dickey 1996-on 2362- * @Id: resizeterm.3x,v 1.25 2018/07/28 22:20:54 tom Exp @ 2363+ * @Id: resizeterm.3x,v 1.26 2019/09/21 23:44:41 tom Exp @ 2364 --> 2365 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> 2366 <HTML> 2367@@ -74,32 +74,41 @@ 2368 2369 </PRE><H3><a name="h3-resize_term">resize_term</a></H3><PRE> 2370 Most of the work is done by the inner function <STRONG>resize_term</STRONG>. The outer 2371- function <STRONG>resizeterm</STRONG> adds bookkeeping for the <STRONG>SIGWINCH</STRONG> handler. When 2372- resizing the windows, <STRONG>resize_term</STRONG> blank-fills the areas that are 2373+ function <STRONG>resizeterm</STRONG> adds bookkeeping for the <STRONG>SIGWINCH</STRONG> handler, as well 2374+ as repainting the soft-key area (see <STRONG><A HREF="slk_touch.3x.html">slk_touch(3x)</A></STRONG>). 2375+ 2376+ When resizing the windows, <STRONG>resize_term</STRONG> blank-fills the areas that are 2377 extended. The calling application should fill in these areas with 2378- appropriate data. The <STRONG>resize_term</STRONG> function attempts to resize all win- 2379- dows. However, due to the calling convention of pads, it is not possi- 2380- ble to resize these without additional interaction with the applica- 2381- tion. 2382+ appropriate data. 2383+ 2384+ The <STRONG>resize_term</STRONG> function attempts to resize all windows. However, due 2385+ to the calling convention of pads, it is not possible to resize these 2386+ without additional interaction with the application. 2387+ 2388+ When resizing windows, <STRONG>resize_term</STRONG> recursively adjusts subwindows, 2389+ keeping them within the updated parent window's limits. If a top-level 2390+ window happens to extend to the screen's limits, then on resizing the 2391+ window, <STRONG>resize_term</STRONG> will keep the window extending to the corresponding 2392+ limit, regardless of whether the screen has shrunk or grown. 2393 2394 2395 </PRE><H3><a name="h3-is_term_resized">is_term_resized</a></H3><PRE> 2396 A support function <STRONG>is_term_resized</STRONG> is provided so that applications can 2397- check if the <STRONG>resize_term</STRONG> function would modify the window structures. 2398+ check if the <STRONG>resize_term</STRONG> function would modify the window structures. 2399 It returns <STRONG>TRUE</STRONG> if the windows would be modified, and <STRONG>FALSE</STRONG> otherwise. 2400 2401 2402 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE> 2403- Except as noted, these functions return the integer <STRONG>ERR</STRONG> upon failure 2404+ Except as noted, these functions return the integer <STRONG>ERR</STRONG> upon failure 2405 and <STRONG>OK</STRONG> on success. They will fail if either of the dimensions are less 2406- than or equal to zero, or if an error occurs while (re)allocating mem- 2407+ than or equal to zero, or if an error occurs while (re)allocating mem- 2408 ory for the windows. 2409 2410 2411 </PRE><H2><a name="h2-NOTES">NOTES</a></H2><PRE> 2412- While these functions are intended to be used to support a signal han- 2413- dler (i.e., for <STRONG>SIGWINCH</STRONG>), care should be taken to avoid invoking them 2414- in a context where <STRONG>malloc</STRONG> or <STRONG>realloc</STRONG> may have been interrupted, since 2415+ While these functions are intended to be used to support a signal han- 2416+ dler (i.e., for <STRONG>SIGWINCH</STRONG>), care should be taken to avoid invoking them 2417+ in a context where <STRONG>malloc</STRONG> or <STRONG>realloc</STRONG> may have been interrupted, since 2418 it uses those functions. 2419 2420 If ncurses is configured to supply its own <STRONG>SIGWINCH</STRONG> handler, 2421@@ -113,17 +122,17 @@ 2422 <STRONG>o</STRONG> which <STRONG>ungetch</STRONG>'s a <STRONG>KEY_RESIZE</STRONG> which will be read on the next call to 2423 <STRONG>wgetch</STRONG>. 2424 2425- The <STRONG>KEY_RESIZE</STRONG> alerts an application that the screen size has 2426- changed, and that it should repaint special features such as pads 2427+ The <STRONG>KEY_RESIZE</STRONG> alerts an application that the screen size has 2428+ changed, and that it should repaint special features such as pads 2429 that cannot be done automatically. 2430 2431 Calling <STRONG>resizeterm</STRONG> or <STRONG>resize_term</STRONG> directly from a signal handler is 2432- unsafe. This indirect method is used to provide a safe way to 2433+ unsafe. This indirect method is used to provide a safe way to 2434 resize the ncurses data structures. 2435 2436- If the environment variables <STRONG>LINES</STRONG> or <STRONG>COLUMNS</STRONG> are set, this overrides 2437- the library's use of the window size obtained from the operating sys- 2438- tem. Thus, even if a <STRONG>SIGWINCH</STRONG> is received, no screen size change may 2439+ If the environment variables <STRONG>LINES</STRONG> or <STRONG>COLUMNS</STRONG> are set, this overrides 2440+ the library's use of the window size obtained from the operating sys- 2441+ tem. Thus, even if a <STRONG>SIGWINCH</STRONG> is received, no screen size change may 2442 be recorded. 2443 2444 2445@@ -136,7 +145,7 @@ 2446 2447 Doing that clears the screen and is visually distracting. 2448 2449- This extension of ncurses was introduced in mid-1995. It was adopted 2450+ This extension of ncurses was introduced in mid-1995. It was adopted 2451 in NetBSD curses (2001) and PDCurses (2003). 2452 2453 2454@@ -145,7 +154,7 @@ 2455 2456 2457 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> 2458- Thomas Dickey (from an equivalent function written in 1988 for BSD 2459+ Thomas Dickey (from an equivalent function written in 1988 for BSD 2460 curses). 2461 2462 2463Index: doc/html/man/tabs.1.html 2464--- ncurses-6.1-20190914+/doc/html/man/tabs.1.html 2019-07-26 23:48:29.000000000 +0000 2465+++ ncurses-6.1-20190921/doc/html/man/tabs.1.html 2019-09-21 23:49:54.000000000 +0000 2466@@ -205,7 +205,7 @@ 2467 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 2468 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. 2469 2470- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190727). 2471+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190921). 2472 2473 2474 2475Index: doc/html/man/terminfo.5.html 2476--- ncurses-6.1-20190914+/doc/html/man/terminfo.5.html 2019-07-27 20:27:54.000000000 +0000 2477+++ ncurses-6.1-20190921/doc/html/man/terminfo.5.html 2019-09-21 23:49:54.000000000 +0000 2478@@ -103,7 +103,7 @@ 2479 have, by specifying how to perform screen operations, and by specifying 2480 padding requirements and initialization sequences. 2481 2482- This manual describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190727). 2483+ This manual describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190921). 2484 2485 2486 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE> 2487Index: doc/html/man/tic.1m.html 2488--- ncurses-6.1-20190914+/doc/html/man/tic.1m.html 2019-07-26 23:48:29.000000000 +0000 2489+++ ncurses-6.1-20190921/doc/html/man/tic.1m.html 2019-09-21 23:49:54.000000000 +0000 2490@@ -438,7 +438,7 @@ 2491 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, 2492 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>. <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>. 2493 2494- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190727). 2495+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190921). 2496 2497 2498 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> 2499Index: doc/html/man/toe.1m.html 2500--- ncurses-6.1-20190914+/doc/html/man/toe.1m.html 2019-07-26 23:48:30.000000000 +0000 2501+++ ncurses-6.1-20190921/doc/html/man/toe.1m.html 2019-09-21 23:49:54.000000000 +0000 2502@@ -170,7 +170,7 @@ 2503 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG>ter-</STRONG> 2504 <STRONG><A HREF="terminfo.5.html">minfo(5)</A></STRONG>. 2505 2506- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190727). 2507+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190921). 2508 2509 2510 2511Index: doc/html/man/tput.1.html 2512--- ncurses-6.1-20190914+/doc/html/man/tput.1.html 2019-07-26 23:48:30.000000000 +0000 2513+++ ncurses-6.1-20190921/doc/html/man/tput.1.html 2019-09-21 23:49:54.000000000 +0000 2514@@ -522,7 +522,7 @@ 2515 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 2516 <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>. 2517 2518- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190727). 2519+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190921). 2520 2521 2522 2523Index: doc/html/man/tset.1.html 2524--- ncurses-6.1-20190914+/doc/html/man/tset.1.html 2019-07-26 23:48:30.000000000 +0000 2525+++ ncurses-6.1-20190921/doc/html/man/tset.1.html 2019-09-21 23:49:54.000000000 +0000 2526@@ -389,7 +389,7 @@ 2527 <STRONG>csh(1)</STRONG>, <STRONG>sh(1)</STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG>tty(4)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, 2528 <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG> 2529 2530- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190727). 2531+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190921). 2532 2533 2534 2535Index: man/resizeterm.3x 2536Prereq: 1.25 2537--- ncurses-6.1-20190914+/man/resizeterm.3x 2018-07-28 22:20:54.000000000 +0000 2538+++ ncurses-6.1-20190921/man/resizeterm.3x 2019-09-21 23:44:41.000000000 +0000 2539@@ -1,5 +1,5 @@ 2540 .\"*************************************************************************** 2541-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * 2542+.\" Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * 2543 .\" * 2544 .\" Permission is hereby granted, free of charge, to any person obtaining a * 2545 .\" copy of this software and associated documentation files (the * 2546@@ -28,7 +28,7 @@ 2547 .\" 2548 .\" Author: Thomas E. Dickey 1996-on 2549 .\" 2550-.\" $Id: resizeterm.3x,v 1.25 2018/07/28 22:20:54 tom Exp $ 2551+.\" $Id: resizeterm.3x,v 1.26 2019/09/21 23:44:41 tom Exp $ 2552 .TH resizeterm 3X "" 2553 .de bP 2554 .ie n .IP \(bu 4 2555@@ -61,14 +61,24 @@ 2556 .PP 2557 Most of the work is done by the inner function \fBresize_term\fR. 2558 The outer function \fBresizeterm\fR adds bookkeeping 2559-for the \fBSIGWINCH\fP handler. 2560+for the \fBSIGWINCH\fP handler, 2561+as well as repainting the soft-key area (see \fBslk_touch\fP(3X)). 2562+.PP 2563 When resizing the windows, 2564 \fBresize_term\fR blank-fills the areas that are extended. 2565 The calling application should fill in these areas with appropriate data. 2566+.PP 2567 The \fBresize_term\fR function attempts to resize all windows. 2568 However, due to the calling convention of pads, 2569 it is not possible to resize these 2570 without additional interaction with the application. 2571+.PP 2572+When resizing windows, \fBresize_term\fR recursively adjusts subwindows, 2573+keeping them within the updated parent window's limits. 2574+If a top-level window happens to extend to the screen's limits, 2575+then on resizing the window, \fBresize_term\fR will keep the window 2576+extending to the corresponding limit, regardless of whether the 2577+screen has shrunk or grown. 2578 .SS is_term_resized 2579 .PP 2580 A support function \fBis_term_resized\fR is provided so that applications 2581Index: package/debian-mingw/changelog 2582--- ncurses-6.1-20190914+/package/debian-mingw/changelog 2019-09-14 13:43:52.000000000 +0000 2583+++ ncurses-6.1-20190921/package/debian-mingw/changelog 2019-09-21 14:56:20.000000000 +0000 2584@@ -1,8 +1,8 @@ 2585-ncurses6 (6.1+20190914) unstable; urgency=low 2586+ncurses6 (6.1+20190921) unstable; urgency=low 2587 2588 * latest weekly patch 2589 2590- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Sep 2019 09:43:52 -0400 2591+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Sep 2019 10:56:20 -0400 2592 2593 ncurses6 (5.9-20131005) unstable; urgency=low 2594 2595Index: package/debian-mingw64/changelog 2596--- ncurses-6.1-20190914+/package/debian-mingw64/changelog 2019-09-14 13:43:52.000000000 +0000 2597+++ ncurses-6.1-20190921/package/debian-mingw64/changelog 2019-09-21 14:56:20.000000000 +0000 2598@@ -1,8 +1,8 @@ 2599-ncurses6 (6.1+20190914) unstable; urgency=low 2600+ncurses6 (6.1+20190921) unstable; urgency=low 2601 2602 * latest weekly patch 2603 2604- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Sep 2019 09:43:52 -0400 2605+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Sep 2019 10:56:20 -0400 2606 2607 ncurses6 (5.9-20131005) unstable; urgency=low 2608 2609Index: package/debian/changelog 2610--- ncurses-6.1-20190914+/package/debian/changelog 2019-09-14 13:43:52.000000000 +0000 2611+++ ncurses-6.1-20190921/package/debian/changelog 2019-09-21 14:56:20.000000000 +0000 2612@@ -1,8 +1,8 @@ 2613-ncurses6 (6.1+20190914) unstable; urgency=low 2614+ncurses6 (6.1+20190921) unstable; urgency=low 2615 2616 * latest weekly patch 2617 2618- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Sep 2019 09:43:52 -0400 2619+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Sep 2019 10:56:20 -0400 2620 2621 ncurses6 (5.9-20120608) unstable; urgency=low 2622 2623Index: package/mingw-ncurses.nsi 2624Prereq: 1.351 2625--- ncurses-6.1-20190914+/package/mingw-ncurses.nsi 2019-09-14 13:43:52.000000000 +0000 2626+++ ncurses-6.1-20190921/package/mingw-ncurses.nsi 2019-09-21 14:56:20.000000000 +0000 2627@@ -1,4 +1,4 @@ 2628-; $Id: mingw-ncurses.nsi,v 1.351 2019/09/14 13:43:52 tom Exp $ 2629+; $Id: mingw-ncurses.nsi,v 1.352 2019/09/21 14:56:20 tom Exp $ 2630 2631 ; TODO add examples 2632 ; TODO bump ABI to 6 2633@@ -10,7 +10,7 @@ 2634 !define VERSION_MAJOR "6" 2635 !define VERSION_MINOR "1" 2636 !define VERSION_YYYY "2019" 2637-!define VERSION_MMDD "0914" 2638+!define VERSION_MMDD "0921" 2639 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} 2640 2641 !define MY_ABI "5" 2642Index: package/mingw-ncurses.spec 2643--- ncurses-6.1-20190914+/package/mingw-ncurses.spec 2019-09-14 13:43:52.000000000 +0000 2644+++ ncurses-6.1-20190921/package/mingw-ncurses.spec 2019-09-21 14:56:20.000000000 +0000 2645@@ -3,7 +3,7 @@ 2646 Summary: shared libraries for terminal handling 2647 Name: mingw32-ncurses6 2648 Version: 6.1 2649-Release: 20190914 2650+Release: 20190921 2651 License: X11 2652 Group: Development/Libraries 2653 Source: ncurses-%{version}-%{release}.tgz 2654Index: package/ncurses.spec 2655--- ncurses-6.1-20190914+/package/ncurses.spec 2019-09-14 13:43:52.000000000 +0000 2656+++ ncurses-6.1-20190921/package/ncurses.spec 2019-09-21 14:56:20.000000000 +0000 2657@@ -1,7 +1,7 @@ 2658 Summary: shared libraries for terminal handling 2659 Name: ncurses6 2660 Version: 6.1 2661-Release: 20190914 2662+Release: 20190921 2663 License: X11 2664 Group: Development/Libraries 2665 Source: ncurses-%{version}-%{release}.tgz 2666Index: package/ncursest.spec 2667--- ncurses-6.1-20190914+/package/ncursest.spec 2019-09-14 13:43:52.000000000 +0000 2668+++ ncurses-6.1-20190921/package/ncursest.spec 2019-09-21 14:56:20.000000000 +0000 2669@@ -1,7 +1,7 @@ 2670 Summary: Curses library with POSIX thread support. 2671 Name: ncursest6 2672 Version: 6.1 2673-Release: 20190914 2674+Release: 20190921 2675 License: X11 2676 Group: Development/Libraries 2677 Source: ncurses-%{version}-%{release}.tgz 2678