import ncurses 6.2-20200215vendor/ncurses/6.2-20200215

1127 files changed, 15354 insertions, 15800 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index 8bda60e2f074..e0603d622394 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-                            Announcing ncurses 6.1
+                            Announcing ncurses 6.2
 
 Overview
 
@@ -17,7 +17,7 @@ Overview
      * It is used in almost every system based on the Linux kernel (aside
        from some embedded applications).
      * It  is  used  as the system curses library on OpenBSD, FreeBSD and
-       OSX.
+       MacOS.
      * It  is used in environments such as Cygwin and MinGW. The first of
        these was EMX on OS/2 Warp.
      * It is used (though usually not as the system curses) on all of the
@@ -26,611 +26,374 @@ Overview
      * It should work readily on any ANSI/POSIX-conforming unix.
 
    The distribution includes the library and support utilities, including
-     * [1]captoinfo, a termcap conversion tool
-     * [2]clear, utility for clearing the screen
-     * [3]infocmp, the terminfo decompiler
-     * [4]tabs, set tabs on a terminal
-     * [5]tic, the terminfo compiler
-     * [6]toe, list (table of) terminfo entries
-     * [7]tput,  utility  for  retrieving  terminal capabilities in shell
+     * captoinfo, a termcap conversion tool
+     * clear, utility for clearing the screen
+     * infocmp, the terminfo decompiler
+     * tabs, set tabs on a terminal
+     * tic, the terminfo compiler
+     * toe, list (table of) terminfo entries
+     * tput,  utility  for  retrieving  terminal  capabilities  in  shell
        scripts
-     * [8]tset, to initialize the terminal
+     * tset, to initialize the terminal
 
    Full manual pages are provided for the library and tools.
 
-   The ncurses distribution is available at ncurses' [9]homepage:
+   The ncurses distribution is available at ncurses' homepage:
 
-     [10]ftp://ftp.invisible-island.net/ncurses/ or
-     [11]https://invisible-mirror.net/archives/ncurses/ .
+     ftp://ftp.invisible-island.net/ncurses/ or
+     https://invisible-mirror.net/archives/ncurses/ .
 
    It is also available via anonymous FTP at the GNU distribution site
 
-     [12]ftp://ftp.gnu.org/gnu/ncurses/ .
+     ftp://ftp.gnu.org/gnu/ncurses/ .
 
 Release Notes
 
-   These notes are for ncurses 6.1, released January 27, 2018.
+   These notes are for ncurses 6.2, released February 12, 2020.
 
    This  release  is  designed  to  be source-compatible with ncurses 5.0
-   through  6.0; providing extensions to the application binary interface
+   through  6.1; providing extensions to the application binary interface
    (ABI).  Although  the  source  can  still be configured to support the
-   ncurses  5  ABI, the intent of the release is to provide extensions to
-   the ncurses 6 ABI:
-     * improve integration of tput and tset
-     * provide support for extended numeric capabilities.
+   ncurses  5  ABI, the reason for the release is to reflect improvements
+   to the ncurses 6 ABI and the supporting utility programs.
 
    There  are,  of  course,  numerous  other improvements, listed in this
    announcement.
 
-   The  release notes also mention some bug-fixes, but are focused on new
-   features  and  improvements  to  existing  features  since ncurses 6.0
-   release.
+   The  most  important  bug-fixes/improvements  dealt  with user-defined
+   capabilities  in terminal descriptions. The release notes also mention
+   some other bug-fixes, but are focused on new features and improvements
+   to existing features since ncurses 6.1 release.
 
   Library improvements
 
     New features
 
-   The  improved  integration of tput and tset made only small changes to
-   the  libraries.  However,  supporting  extended  numeric  capabilities
-   required a few changes:
-     * The  TERMINAL  structure  in  <term.h>  is  now opaque. Doing that
-       allowed  making the structure larger, to hold the extended numeric
-       data.
-       A   few   applications  required  changes  during  development  of
-       ncurses 6.1 because those applications misused the members of that
-       structure,   e.g.,   directly   modifying  it  rather  than  using
-       [13]def_prog_mode.
-     * Having  made  TERMINAL  opaque  (and  because  none of the library
-       functions  use  anything  except  a  pointer  to TERMINAL), it was
-       possible to increase the size of the structure, adding to the end.
-       Existing   applications  which  were  linked  to  the  ncurses 6.0
-       high-level   (ncurses,  ncursesw)  and  low-level  (tinfo,  tinfo)
-       libraries should not require re-linking since the binary interface
-       did  not  change,  nor  did  the  structure  offsets with TERMINAL
-       change.
-       A  few  applications use the inner TERMTYPE structure's offsets to
-       refer to terminfo capabilities within that structure. Again, those
-       do  not require modification because their offsets within TERMINAL
-       did not change.
-     * When configured for wide-characters, i.e., "ncursesw" the TERMINAL
-       structure is extended.
-       The  new  data in TERMINAL holds the same information as TERMTYPE,
-       but  with  larger  numbers  ("int"  versus  "short").  It is named
-       TERMTYPE2.
-       The  library  uses  this  structure  internally  in  preference to
-       TERMTYPE,   referring  to  TERMTYPE  only  to  initialize  it  for
-       applications that use the capabilities defined in <term.h>
-     * When  configured  for  8-bit  (narrow)  characters,  the TERMTYPE2
-       structure is not used.
-     * The updated application binary interface is 6.1.20171230 (used for
-       new  [14]versioned  symbols),  although the interface changes were
-       developed several months previously.
-
-   The  motivation  for  making  this  extension  came from noticing that
-   [15]termcap  applications  could  (though  not  [16]realistically) use
-   larger numbers than would fit in 16-bits, and the fact that the number
-   of  color  pairs  for  a  256-color  xterm  could  not be expressed in
-   terminfo  (i.e.,  32767  versus  65536). Also, a few terminals support
-   direct-colors, which could use the extension.
-
-   Generally  speaking,  applications  that  use  internal  details  of a
-   library  are unsupported. There was exactly one exception for ncurses:
-   the  tack  program  used  the internal details of TERMINAL, because it
-   provides  an  ncurses-specific  feature  for interactively modifying a
-   terminfo   description  and  writing  the  updated  description  to  a
-   text-file.  It  was  possible  to  not  only  separate tack from these
-   [17]internal  details  of  ncurses,  but  to generalize it so that the
-   program   works   with  Unix  curses  (omitting  the  ncurses-specific
-   feature). That was released as [18]tack 1.08 in July 2017.
-
-   While  making changes to tack to eliminate its dependency upon ncurses
-   internals,  the  publicly-visible  details  of  those  internals  were
-   reviewed,  and  some symbols were moved to private header files, while
-   others were marked explicitly as ncurses internals. Future releases of
-   ncurses  may  eliminate  some  of those symbols (such as those used by
-   tack 1.07) because they are neither part of the API or the ABI.
-
-   Using  the  TERMTYPE2 extended numeric capabilities, it is possible to
-   support  both  color  pair  values and color values past 32767. Taking
-   compatibility into account, developers readily understand that neither
-   function  signatures  nor  structure  offsets  change.  Also, existing
-   functions have to operate with the extended numbers. Most of that work
-   is  internal  to  the  library.  For the external interfaces, a hybrid
-   approach was used:
-     * X/Open  Curses  defined function prototypes such as wattr_set with
-       an  unused parameter, for "future" use. After 25 years, the future
-       is  here:  ncurses uses the parameter to augment color pair values
-       as described in the [19]manual page.
-     * Other  functions such as those defining color pairs did not have a
-       corresponding  reserved  parameter.  For  those,  ncurses  defines
-       extended  versions  such as init_extended_pair (versus init_pair),
-       init_extended_color (versus init_color).
+   There are several new features:
+     * O_EDGE_INSERT_STAY  tells  the  form  library  to optionally delay
+       cursor movement on a field edge/boundary
+     * O_INPUT_FIELD  extension to form library allows a dynamic field to
+       shrink if the new limit is smaller than the current field size.
+     * added  exit_curses  and  exit_terminfo to replace internal symbols
+       for leak-checking.
+     * added curses_trace, to replace trace().
 
    Additionally,  to  improve  performance other changes (and extensions)
    are provided in this release:
-     * Several  new  functions simplify management of large sets of color
-       pairs: reset_color_pairs, alloc_pair, find_pair and free_pair.
-     * New "RGB" extension capability for direct-color support is used to
-       improve performance of color_content.
-     * The  internal colorpair_t is now a struct, eliminating an internal
-       8-bit limit on colors
-     * Allocation  for  SCREEN's  color-pair table starts small, grows on
-       demand up to the limit given in the terminal description.
-     * setcchar and getcchar now treat a negative color-pair as an error.
+     * mouse  decoding  now handles shift/control/alt logic when decoding
+       xterm's 1006 mode
+     * ncurses  now  defines a limit for wgetnstr, wgetn_wstr when length
+       is negative or "too large".
+     * reordered  loop-limit checks in winsnstr in case the string has no
+       terminating null and only the number of characters is used.
+     * there  is  now  no  buffer-size  limit  when  reading the $TERMCAP
+       variable.
+     * the  $TERMCAP  variable  may  be  interpreted  as  a fallback to a
+       terminfo entry
+     * mvcur  now decides whether to use hard-tabs, using xt, tbc and hts
+       as clues.
+     * extended  colors  are  improved  by  modifying an internal call to
+       vid_puts  to pass extended color pairs e.g., from tty_update.c and
+       lib_mvcur.c
+     * the  initialization  functions  now  avoid relying upon persistent
+       data for the result from getenv
+     * scrolling is improved:
+          + a limit check in newline_forces_scroll handles the case where
+            the row is inside scroll-margins, but not at the end.
+          + improved loop limits in _nc_scroll_window handle a case where
+            the scrolled data is a pad which is taller than the window.
 
     Other improvements
 
-   These are new or revised features:
-     * modify  c++/etip.h.in  to  accommodate  deprecation  of  throw and
-       throws in c++17
-     * add new function unfocus_current_field
-     * add option to preserve leading whitespace in form fields
-     * add  a  macro  for is_linetouched and adjust the function's return
-       value  to  make  it possible for most applications to check for an
-       error-return.
-     * add  build-time  utility  report_offsets  to  help  show  when the
-       various configurations of tinfo library are compatible or not.
+   These are revised features:
+     * used  "const"  in  some prototypes rather than NCURSES_CONST where
+       X/Open  Curses  was updated to do this, e.g., wscanw, newterm, the
+       terminfo  interface.  Also  use  "const"  for  consistency  in the
+       termcap interface, which was withdrawn by X/Open Curses in Issue 5
+       (2007).  As  of  Issue  7,  X/Open  Curses still lacks "const" for
+       certain return values, e.g., keyname.
+     * modified  wbkgd  and  wbkgrnd  to  improve compatibility with SVr4
+       curses,  changing the way the window rendition is updated when the
+       background character is modified
+     * improved  terminfo  write/read by modifying the fourth item of the
+       extended  header  to  denote  the  number  of valid strings in the
+       extended string table (see term(5)).
+     * modified   the   initialization  checks  for  mouse  so  that  the
+       xterm+sm+1006  block  will  work  with  terminal  descriptions not
+       mentioning xterm.
 
    These were done to limit or ultimately deprecate features:
-     * drop  two  symbols  obsoleted  in  2004:  _nc_check_termtype,  and
-       _nc_resolve_uses
-     * move  _nc_tracebits,  _tracedump and _tracemouse to curses.priv.h,
-       since they are not part of the suggested ABI6.
-     * mark  some  structs  in  form/menu/panel  libraries as potentially
-       opaque without modifying API/ABI.
-     * ifdef'd     header-file    definition    of    mouse_trafo    with
-       NCURSES_NOMACROS
-     * remove  initialization-check  for calling napms in the term-driver
-       configuration; none is needed.
-     * modify trace to avoid overwriting existing file
+     * deprecated  safe-sprintf, since the vsnprintf function, which does
+       what was needed, was standardized long ago.
+     * marked   vwprintw  and  vwscanw  as  deprecated;  recommend  using
+       vw_printw and vw_scanw, respectively.
+     * added  deprecation warnings for internal functions called by older
+       versions of tack.
+     * removed unused _nc_import_termtype2 function.
 
    These are improvements to existing features:
-     * modify   make_hash   to  allow  building  with  address-sanitizer,
-       assuming that --disable-leaks is configured.
-     * move  SCREEN field for use_tioctl data before the ncursesw fields,
-       and  limit  that  to the sp-funcs configuration to improve termlib
-       compatibility
-     * modify db-iterator:
-          + ignore zero-length files in db-iterator; these are useful for
-            instance to suppress $HOME/.terminfo when not wanted.
-          + modify  update_getenv  to  ensure  that environment variables
-            which  are  not  initially  set  will  be checked later if an
-            application happens to set them
-     * modify  _nc_outc_wrapper  to use the standard output if the screen
-       was not initialized, rather than returning an error.
-     * improve  checks for low-level terminfo functions when the terminal
-       has not been initialized.
-     * modify set_curterm to update ttytype[] data used by longname/p>
-     * modify  _nc_get_screensize  to  allow  for  use_env and use_tioctl
-       state  to  be  per-screen  when  sp-funcs  are  configured, better
-       matching the behavior when using the term-driver configuration.
-     * remove an early-return from _nc_do_color, which can interfere with
-       data  needed  by  bkgd  when  ncurses  is configured with extended
-       colors
-     * incorporate A_COLOR mask into COLOR_PAIR, in case user application
-       provides an out-of-range pair number
-     * modify  logic for endwin-state to be able to detect the case where
-       the screen was never initialized, using that to trigger a flush of
-       ncurses'  buffer for mvcur, e.g., in the sample program dots_mvcur
-       for the term-driver configuration.
+     * check parameter of set_escdelay, return ERR if negative.
+     * check  parameter  of  set_tabsize,  return ERR if not greater than
+       zero
+     * correct  a status-check in _nc_read_tic_entry() so that if reading
+       a hex/b64 $TERMINFO, and the $TERM does not match, fall-through to
+       the compiled-in search list.
+     * amend check for repeat_char to handle a case where setlocale() was
+       called after initscr
+     * move macro for is_linetouched inside NCURSES_NOMACROS ifndef.
+     * use _nc_copy_termtype2 rather than direct assignment in setupterm,
+       in   case   it   is  called  repeatedly  using  fallback  terminfo
+       descriptions
+     * improve   workaround   for  Solaris  wcwidth  versus  line-drawing
+       characters
+     * add  checks  in repair_subwindows to keep the current position and
+       scroll-margins inside the resized subwindow.
+     * correct  a  buffer-limit  in  write_entry.c  for  systems that use
+       caseless filenames.
+     * improved build-time utility report_offsets:
+          + add categories, e.g., "w" for wide-character, "t" for threads
+            to  make the report more readable. Reorganized the structures
+            reported to make the categories more apparent.
+          + add  NCURSES_GLOBALS  and NCURSES_PRESCREEN to report to show
+            how similar the different libtinfo configurations are.
+     * modified  some header files to ensure that those include necessary
+       files except for the previously-documented cases
+     * added  some  traces  in  initialization to show whether a fallback
+       entry is used.
+     * made minor optimization to reduce calls to _nc_reserve_pairs
 
    These are corrections to existing features:
-     * fixes for writing extended color pairs in putwin.
-     * modify no-leaks code for lib_cur_term.c to account for the tgetent
-       cache.
-     * amend handling of the repeat_char capability in EmitRange to avoid
-       scope  creep:  translate  the character to the alternate character
-       set  when  the  alternate character set is enabled, and do not use
-       repeat_char for characters past 255.
-     * improve    wide-character    implementation    of   myADDNSTR   in
-       frm_driver.c,    which    was   inconsistent   with   the   normal
-       implementation.
-     * modify winnstr and winchnstr to return error if the output pointer
-       is  null,  as  well  as  adding a null pointer check of the window
-       pointer for better compatibility with other implementations.
-     * modify  setupterm  to  save  original  tty-modes so that erasechar
-       works  as expected. Also modify _nc_setupscreen to avoid redundant
-       calls to get original tty-modes.
-     * modify  wattr_set  and wattr_get to return ERR if win-parameter is
-       null, as documented.
-     * correct   order  of  initialization  for  traces  in  use_env  and
-       use_tioctl versus first _tracef calls.
-     * correct parameters for copywin call in _nc_Synchronize_Attributes
-     * flush  the  standard  output in _nc_flush for the case where SP is
-       zero,  e.g.,  when  called  via  putp. This fixes a scenario where
-       "tput flash" did not work after changes in 20130112.
-     * amend  internal  use  of  tputs  to consistently use the number of
-       lines  affected,  e.g.,  for  insert/delete  character operations.
-       While  merging terminfo source early in 1995, several descriptions
-       used  the "*" proportional delay for these operations, prompting a
-       change in doupdate.
-     * correct return-value of extended putwin.
-     * double-width  multibyte  characters  were  not counted properly in
-       winsnstr and wins_nwstr.
-     * amend  fix  for  _nc_ripoffline from 20091031 to make test/ditto.c
-       work in threaded configuration.
-     * modify _nc_viscbuf2 and _tracecchar_t2 to trace wide-characters as
-       a whole rather than their multibyte equivalents.
-     * minor  fix  in  wadd_wchnstr  to ensure that each cell has nonzero
-       width.
-     * move PUTC_INIT calls next to wcrtomb calls, to avoid carry-over of
-       error status when processing Unicode values which are not mapped.
-     * add missing assignment in lib_getch.c to make notimeout work
+     * fix  a  special  case  in  PutAttrChar  where  a cell is marked as
+       alternate-character  set,  but  the  terminal  does  not  actually
+       support the given graphic character. This would happen in an older
+       terminal such as vt52, which lacks most line-drawing capability.
+     * corrected  flag  for "seq" method of db 1.8.5 interface, needed by
+       toe on some of the BSDs.
+     * modify  comparison  in  make_hash.c  to  correct a special case in
+       collision handling for Caps-hpux11
+     * add    extended_slk_color{,_sp}   symbols   to   the   appropriate
+       package/*.{map,sym} files
+     * modify  lib_setup  to  avoid  calling pthread_self() without first
+       verifying that the address is valid, i.e., for weak symbols
+     * add  a  couple  of  broken-linker symbols to the list of versioned
+       symbols to help with link-time optimization versus weak symbols.
 
   Program improvements
 
-   While reviewing user feedback, it became apparent that the differences
-   between [20]reset (an alias for tset) and "tput reset" were confusing:
-     * one  ([21]tset)  updated the terminal modes, but used only part of
-       the terminfo capabilities for initialization, while
-     * the  other  ([22]tput) used all of the terminal capabilities while
-       neglecting the terminal modes.
-
-   On  further  investigation,  it  turned  out that the differences were
-   largely an accident due to the way those programs had evolved.
-
-   This  release  eliminates  the unnecessary differences, using the same
-   approach  for tput's init (initialization), reset and clear operations
-   as  the separate [23]reset and [24]clear programs. Doing this does not
-   change the command-line options; existing scripts are unaffected.
-
-   These  are the user-visible changes for the three programs (tput, tset
-   and clear):
-     * add  the  terminal-mode  parts  of "reset" (aka tset) to the "tput
-       reset"  command,  making  the  two  almost  the  same  except  for
-       window-size.
-     * improve  tput's  check  for  being  called as "init" or "reset" to
-       allow for transformed names.
-     * add "clear" as a possible link/alias to tput.
-     * amend changes for tput to reset tty modes to "sane" if the program
-       is  run  as  "reset",  like tset. Likewise, ensure that tset sends
-       either reset- or init-strings.
-     * add -x option to clear/tput to make the E3 extension optional
-     * add functionality of "tset -w" to tput, like the "-c" feature this
-       is not optional in tput.
-     * add  options  -T  and  -V  to clear command for compatibility with
-       tput.
-     * drop long-obsolete "-n" option from tset.
-     * modify tset's assignment to TERM in its output to reflect the name
-       by  which  the  terminal  description  is  found,  rather than the
-       primary  name.  That  was  an  unnecessary  part  from the initial
-       conversion  of  tset from termcap to terminfo. The termcap library
-       in 4.3BSD did this to avoid using the short 2-character name
-     * remove  a  restriction  in  tput's support for termcap names which
-       omitted capabilities normally not shown in termcap translations
-     * add usage message to clear command
-     * improve usage messages for tset and tput.
-
-   Other user-visible improvements and new features include:
-     * modify  tic/infocmp  display  of numeric values to use hexadecimal
-       when  they  are  "close" to a power of two, making the result more
-       readable.
-     * add "-W" option to tic/infocmp to force long strings to wrap.
-          + This  is in addition to the "-w" option which attempts to fit
-            capabilities into a given line-length.
-          + If  "-f"  option  splits  line,  do not further split it with
-            "-W".
-          + Begin a new line when adding "use=" after a wrapped line.
-     * add  "-q"  option  to infocmp to suppress the "Reconstructed from"
-       comment  from  the  header,  and  a corresponding option to tic to
-       suppress all comments from the "tic -I" output.
-     * Sorted options in usage message for infocmp, to make it simpler to
-       see unused letters.
-     * Updated usage message for tic, adding "-0" option.
-     * add infocmp/tic "-Q" option, which allows one to dump the compiled
-       form of the terminal entry, in hexadecimal or base64:
-          + A  "b64:"  prefix in the TERMINFO variable tells the terminfo
-            reader  to  use  base64  according  to  RFC-3548  as  well as
-            RFC-4648 url/filename-safe format.
-          + A   "hex:"   prefix  tells  the  terminfo  reader  to  accept
-            hexadecimal data as generated by "infocmp -0qQ1".
-
-   Other less-visible improvements and new features include:
-     * modify  utility headers such as tic.h to make it clearer which are
-       externals that are used by tack.
-     * add  "reset"  to  list  of  programs  whose  names might change in
-       manpages due to program-transformation configure options.
-     * modify  "-T" option of clear and tput to call use_tioctl to obtain
-       the operating system's notion of the screensize if possible.
-     * add  check  in  tput for init/reset operands to ensure those use a
-       terminal.
-     * modify  programs clear, tabs, tput and tset to pass the actual tty
-       file  descriptor  to  setupterm rather than the standard output or
-       error, making padding work.
-     * change  tset's initialization to allow it to get settings from the
-       standard  input  as  well  as  /dev/tty, to be more effective when
-       output or error are redirected.
-     * amend  check  in  tput,  tabs  and clear to allow those to use the
-       database-only  features  in cron if a "-T" option gives a suitable
-       terminal name.
-     * improve  error message from tset/reset when both stderr/stdout are
-       redirected to a file or pipe.
-
-   Several  of  the  less  apparent  features  deal  with  translation of
-   terminfo  to  termcap  (and the reverse), with corresponding checks by
-   tic:
-     * modify check in fmt_entry to handle a cancelled reset string. Make
-       similar fixes in other parts of dump_entry.c and tput.c
-     * correct  read of terminfo entry in which all strings are absent or
-       explicitly  cancelled.  Before  this  fix, the result was that all
-       were treated as only absent.
-     * modify   infocmp   to   suppress   mixture   of   absent/cancelled
-       capabilities that would only show as "NULL, NULL", unless the "-q"
-       option is used, e.g., to show "-, @" or "@, -".
-     * correct  a warning from tic about keys which are the same, to skip
-       over missing/cancelled values.
-     * add  check  in  tic for use of bold, etc., video attributes in the
-       color  capabilities,  accounting  whether the feature is listed in
-       ncv.
-     * add  check  in  tic for unnecessary use of "2" to denote a shifted
-       special key.
-     * improve  check  in tic for delays by also warning about beep/flash
-       when  a  delay  is not embedded, or if those use the VT100 reverse
-       video escape without using a delay.
-     * improve  checks  in trim_sgr0, comp_parse.c and parse_entry.c, for
-       cancelled string capabilities.
-     * add  check in tic for some syntax errors of delays, as well as use
-       of proportional delays for non-line capabilities.
-     * add  check  in  tic  for  conflict between ritm, rmso, rmul versus
-       sgr0.
-     * add  check  in _nc_parse_entry for invalid entry name, setting the
-       name to "invalid" to avoid problems storing entries.
-     * improve _nc_tparm_analyze, using that to extend the checks made by
-       tic  for  reporting inconsistencies between the expected number of
-       parameters for a capability and the actual.
-     * remove  tic  warning  about "^?" in string capabilities, which was
-       marked  as  an extension; however all Unix implementations support
-       this  and  X/Open  Curses  does not address it. On the other hand,
-       [25]BSD   termcap   did   not  support  this  feature  (until  the
-       [26]mid-1990s).
-       in  _nc_infotocap,  added  a check to ensure that terminfo "^?" is
-       not written to termcap.
-     * modify  sscanf calls in _nc_infotocap for patterns "%{number}%+%c"
-       and "%'char'%+%c" to check that the final character is really "c",
-       avoiding a case in icl6404 which cannot be converted to termcap.
-     * in  _nc_tic_expand and _nc_infotocap, improved string-length check
-       when  deciding  whether  to  use "^X" or "\xxx" format for control
-       characters, to make the output of tic/infocmp more predictable.
-     * limited  termcap  "%d" width to 2 digits on input, and use "%2" in
-       preference to "%02" on output.
-     * correct  terminfo/termcap  conversion of "%02" and "%03" into "%2"
-       and "%3"; the result repeated the last character.
+   Several improvements were made to the utility programs:
 
-    Examples
+   clear
 
-   Along  with  the library and utilities, many improvements were made to
-   the [27]ncurses-examples.
-
-   These changes were made to demonstrate new extensions in ncurses:
-     * add   demo_new_pair   program,   to   demonstrate  [28]alloc_pair,
-       [29]find_pair and [30]free_pair functions.
-       This  program  iterates  over  the  possible  color  combinations,
-       allocating  or  initializing color pairs. For best results, choose
-       screen-width dividing evenly into the number of colors. e.g.,
-
-     32x64,32x128   256 colors
-     24x44,24x88    88 colors
-     32x64,24x128   16 colors
-
-     * add  extended_color program, like the older color_set program, but
-       using   the   extended  color  functions,  with  and  without  the
-       SP-functions interface.
-     * add  picsmap  program  to  fill  in some testing issues not met by
-       dots,  using  this  as  the  third  example in a comparison of the
-       [31]ncurses versus slang libraries.
-       The   program  can  directly  read  X  bitmap  and  pixmap  files,
-       displaying  a  picture.  It  can  read  other  image  files  using
-       ImageMagick's convert program to translate the image into text.
-       For 16-, 88- and 256-color terminal descriptions, picsmap can load
-       a  palette file which tells it which color palette entries to use.
-       For direct-colors, the terminal descriptions use the RGB extension
-       capability.
+          + improved  logic  for  clearing with the E3 extension, in case
+            the  terminal  scrolls  content  onto  its saved-lines before
+            actually  clearing  the  display, by clearing the saved-lines
+            after clearing the display
 
-   There are other new example programs and a few scripts:
-     * add  dots_xcurses  program to illustrate a different approach used
-       for extended colors which can be contrasted with dots_curses.
-     * add  list_keys program show function keys for one or more terminal
-       descriptions.  It  uses  ncurses's  convention  of  modifiers  for
-       special keys, based on xterm.
-     * add  padview  program,  to compare pads with direct updates in the
-       view program.
-     * add sp_tinfo program to exercise the SP-functions extension of the
-       low-level terminfo library.
-     * add test-programs for termattrs and term_attrs functions.
-     * add  test_sgr  program  to  exercise  all  combinations of the sgr
-       capability.
-     * add   tput-colorcube   demo  script,  imitating  xterm's  88-  and
-       256-color scripts using tput.
-     * add  tput-initc  script  to  demonstrate  how  tput may be used to
-       initialize a color palette from a data file.
+   infocmp
+
+          + omit  filtering  of  "OTxx" names which are used for obsolete
+            capabilities,  when  the output is sorted by long-names. This
+            change helps when making a table of the short/long capability
+            names.
+
+   tic
+
+          + added   check   for   consistent   alternate   character  set
+            capabilities.
+          + added check for paired indn/rin.
+          + added check for terminals with parm_dch vs parm_ich.
+          + added  check  for  the  case  where setf/setb are given using
+            different   strings,   but   provide   identical  results  to
+            setaf/setab.
+          + corrected check for ich1.
+          + changed  a  too-large  terminal entry from a fatal error to a
+            warning.
+
+   toe
+
+          + ignores  any  hex/b64 $TERMINFO value in the list of terminfo
+            databases.
+
+   tset
+
+          + replace  check  in reset command for obsolete "pt" capability
+            using tbc and hts capabilities as clues
+          + modify reset to allow for tabstops at intervals other than 8.
+          + change   reset's   behavior   for  margins  to  simply  clear
+            soft-margins  if  possible,  rather  than  clearing  and then
+            setting them according to the terminal's width.
+
+   tput
+
+          + add "x" to getopt string so that "tput -x clear" works.
+
+   Several  changes were made to the generated ncurses*config scripts and
+   the   analogous   ".pc"   files  to  reduce  differences  between  the
+   configurations they report:
+     * modified the ncurse*-config and pc-files to more closely match for
+       the -I and -l options.
+     * filtered out linker-specs from the --libs report.
+     * amended  the ncurses*-config and pc-files to take into account the
+       rpath hack which differed between those files.
+     * modified  generated  ncurses*config  and  ncurses.pc, ncursesw.pc,
+       etc., to list helper libraries such as gpm for static linking.
+
+    Examples
+
+   Along  with  the  library and utilities, improvements were made to the
+   ncurses-examples.  Most  of  this  activity  aimed  at  improving  the
+   test-packages.  A few changes are more generally useful, e.g., for the
+   main   ncurses  test-program,  and  for  analyzing  traces  using  the
+   tracemunch script:
+     * improve  recovery  from  error  when  reading command-character in
+       test/ncurses.c, showing the relevant error message and not exiting
+       on EINTR.
+     * improve  tracemunch,  by keeping track of TERMINAL* values, and if
+       tracing  was first turned on after initialization, attempt to show
+       distinct screen, window and terminal names anyway.
+     * modify tracemunch to accept filename parameters in addition to use
+       as a pipe/filter.
+     * update  tracemunch  to  work  with  perl 5.26.2, which changed the
+       rules for escaping regular expressions.
+     * add some checks in tracemunch for undefined variables.
+     * modify TurnOn/TurnOff macros (in lib_vidattr.c and lib_vid_attr.c)
+       to avoid expansion of "CUR" in trace.
+
+   There are other new demo/test programs and reusable examples:
+
+   color_content
+          Demonstrate   the   color_content   and  extended_color_content
+          functions.
+
+   demo_tabs
+          A simple demo of tabs in curses.
+
+   dump_window
+          A  portable  curses screen-dump, used to compare ncurses screen
+          contents with Solaris.
+
+   pair_content
+          Demonstrate    the   pair_content   and   extended_pair_content
+          functions.
+
+   report_hashing
+          Check hash-tables used for terminfo and termcap names.
+
+   parse_rgb
+          Sample   implementation  of  the  ncurses  RGB  extension  from
+          user_caps.5, used in picsmap and savescreen programs.
 
    A  variety  of  improvements  were made to existing programs, both new
    features  as  well  as  options added to make the set of programs more
    consistent.
-
-   The  ncurses program is the largest; a proportionately large number of
-   changes were made to it:
-     * modify  a/A  screens to make exiting on an escape character depend
-       on  the start of keypad and timeout modes, to allow better testing
-       of function-keys.
-       add "t" toggle for notimeout function.
-     * modify layout of b/B screens to allow for additional annotation on
-       the  right  margin;  some  terminals  with partial support did not
-       display well.
-     * modify c/C screens to allow for extended color pairs.
-       add z/Z zoom feature to make extended color pairs easier to test.
-       modify  test-screens  to  take advantage of wide screens, reducing
-       the number of lines used for 88- and 256-colors.
-     * modify  "d"  edit-color  screen  to  optionally  read  xterm color
-       palette directly from terminal, as well as handling KEY_RESIZE and
-       screen-repainting with control/L and control/R.
-     * add examples to "F" screen for WACS_D_PLUS and WACS_T_PLUS.
-     * improve  "g"  screen,  correcting  ifdef which made the legend not
-       reflect  changes  to  keypad-  and  scroll-modes.  Added check for
-       return-value of putwin.
-     * make "s" test easier to understand which subtests are available
-       add a corresponding "S" wide-character overlap test-screen.
-     * add "v" screen to show baudrate and other values.
-
-   These changes were made to the other examples:
-     * modify  blue  program  to  use Unicode values for card-glyphs when
-       available, as well as improving the check for CP437 and CP850.
-     * improve   demo_menus   program,   allowing   mouse-click   on  the
-       menu-headers  to  switch  the  active  menu.  This  requires a new
-       extension option O_MOUSE_MENU to tell the menu driver to put mouse
-       events  which  do not apply to the active menu back into the queue
-       so that the application can handle the event.
-     * correct logic in demo_terminfo program for "-f" option
-     * modify  ditto program to allow $XTERM_PROG environment variable to
-       override "xterm" as the name of the program to run in the threaded
-       configuration.
-     * add several options to the "dots" test-programs.
-     * modify filter program:
-          + illustrate  an  alternative  to getnstr, that polls for input
-            while  updating  a  clock  on  the  right  margin  as well as
-            responding to window size-changes.
-          + adapt  logic  used in [32]dialog [33]"--keep-tite" option for
-            filter  program as the "-a" option. When set, filter attempts
-            to suppress the alternate screen.
-     * modify  knight  program  to  provide the "slow" solution for small
-       screens  using  "R", noting that Warnsdorf's method is easily done
-       with "a".
-     * modify  the  savescreen program to add test patterns that exercise
-       88-, 256-, etc., colors.
-     * add  options  to  test_arrays,  for selecting termcap vs terminfo,
-       etc.
-     * modify the view program:
-          + expand  tabs  using  the  ncurses  library rather than in the
-            test-program.
-          + eliminate the "-n" option by simply reading the whole file.
-          + implement page up/down commands.
-          + remove the very old SIGWINCH example; just use KEY_RESIZE.
-     * improve  animation  in  xmas  program  by  adding  a time-delay in
-       blinkit.
-     * modify  several  test-programs  which  call  use_default_colors to
-       consistently do this only if the "-d" option is given.
-     * modify the install-rule for ncurses-examples to put the data files
-       in the data directory, e.g., /usr/share/ncurses-examples.
-     * modify  several  test  programs  to  use  new popup_msgs function,
-       adapted from the help-screen used in the edit_field program.
-     * modify   test   data   for   xterm   palettes  to  use  the  newer
-       color4/color12 values.
-     * improve the tracemunch script:
-          + show screenXX pointers and thread identifiers as names.
-          + chang   address-parameters   of  add_wch,  color_content  and
-            pair_content to dummy parameters.
+     * add  "-l"  option to test/background, to dump screen contents in a
+       form that lets different curses implementations be compared.
+     * add  "@"  command  to  test/ncurses F-test, to allow rapid jump to
+       different character pages.
+     * added enum, regex examples to test/demo_forms
+     * amend  Scaled256() macro in test/picsmap.c to cover the full range
+       0..1000
+     * corrected  pathname used in Ada95 sample programs for explain.txt,
+       to  work  with  test-packages, and used an awk script to split the
+       resulting pathname when it would be too long for a single line.
+     * ignore  interrupted  system-call  in  test/ncurses's command-line,
+       e.g., if the terminal were resized.
+     * improved  ifdef's  for  TABSIZE  variable,  to  help with AIX/HPUX
+       ports.
 
   Terminal database
 
    There are several new terminal descriptions:
 
-     dumb-emacs-ansi,  dvtm,  dvtm-256color,  fbterm,  iterm2,  linux-m1
-     minitel    entries,    putty-noapp,    viewdata,   and   vt100+4bsd
-     building-block.
-
-     xterm+noalt,   xterm+titlestack,   xterm+alt1049,   xterm+alt+title
-     building  blocks  and  xterm+direct,  xterm+indirect, xterm-direct.
-     from [34]xterm patch #331.
-
-     several  other "-direct" descriptions to address the differences of
-     other terminal emulators versus xterm-direct.
+     alacritty,  domterm,  kitty,  mintty,  mintty-direct,  ms-terminal,
+     n7900,   nsterm-build309,  nsterm-direct,  screen5,  ti703,  ti707,
+     ti703-w, ti707-w vscode, vscode-direct, xterm-mono, xterm.js
 
    There  are  many  changes to existing terminal descriptions. Some were
    updates to several descriptions:
-     * use  xterm+sm+1006  in  several  terminal  descriptions which were
-       validated  as  supporting  the  extended  mouse  feature for their
-       respective terminal emulators.
-     * corrected  sgr/sgr0 strings in a few cases reported by tic, making
-       those  correspond  to  the non-sgr settings where they differ, but
-       otherwise use ECMA-48 consistently.
-     * add  0.1sec  mandatory delay to flash capabilities using the VT100
-       reverse-video control
+     * use ansi+rep in a dozen places
+     * add rs1 to konsole, mlterm
+     * improve several flash capabilities with trailing mandatory delays
+     * drop   ich1   from   rxvt-basic,   Eterm  and  mlterm  to  improve
+       compatibility with old non-curses programs
+     * add/use xterm+keypad in xterm-new
+     * use xterm+sl-twm for consistency, nine places
+     * improve xm example in xterm+x11mouse and xterm+sm_1006.
 
    while  others  affected specific descriptions. These were retested, to
-   take into account new/undocumented changes by their developers:
+   take into account changes by their developers:
 
-     iterm, minitel, st, viewdata, nsterm
+     terminator, st
 
-   while these are specific fixes based on user reports, or warnings from
-   tic:
+   while  these are specific fixes based on reviewing documentation, user
+   reports, or warnings from tic:
 
-   [35]ansi building blocks
+   adds200:
 
-          + restored  rmir/smir  in  ansi+idc  to  better  match original
-            ansiterm+idc, add alias ansiterm
+          + fix typo
 
-   [36]icl6402
+   gnome-256color
 
-          + corrected missing comma-separator between string capabilities
-            in icl6402 and m2-nam
+          + base entry on "gnome", not "vte", for consistency
 
-   [37]interix
+   interix
 
-          + updated using tack and SFU with Windows 7 Ultimate.
-          + used ^? for kdch1
+          + trim unnecessary setf/setb
 
-   [38]linux
+   linux-16color
 
-          + made linux3.0 entry the default linux entry
-          + modify  linux2.6  entry  to  improve line-drawing so that the
-            linux3.0 entry can be used in non-UTF-8 mode
-          + omitted  selection  of  ISO-8859-1 for G0 in enacs capability
-            from  linux2.6 entry, to avoid conflict with the user-defined
-            mapping. The reset feature uses ISO-8859-1 in any case.
-          + modify flash capability for linux and wyse entries to put the
-            delay between the reverse/normal escapes rather than after
-          + modify  linux-16color  to  not  mask dim, standout or reverse
-            with the ncv capability
+          + accommodate  Linux  console driver incompatibility introduced
+            in early 2018
 
-   [39]pccon entries
+   nsterm-256color:
 
-          + fixed some inconsistencies in the pccon* entries
-          + add bold to pccon+sgr+acs and pccon-base
-          + add keys f12-f124 to pccon+keys
+          + add nsterm-build309 to replace nsterm-256color, assigning the
+            latter  as  an  alias  of  nsterm,  to  make  mouse work with
+            nsterm-256color
 
-   [40]tmux
+   regent40:
 
-          + corrected  sgr  string,  which  used screen's "standout" code
-            rather than the standard code.
-          + add  settings  corresponding  to xterm-keys option to reflect
-            upcoming change to make that option "on" by default
-          + uncanceled Ms
+          + renumber function-keys to match manual
 
-   [41]vt100
+   regent60:
 
-          + modify  vt100  rs2  string  to  reset vt52 mode and scrolling
-            regions
-          + corrected rs2 string for vt100-nam
-          + made  minor  fixes  for  vt100+4bsd,  e.g.,  delay in sgr for
-            consistency
+          + add cd (clr_eos)
+          + corrected acsc
+          + add shifted function-keys
 
-   [42]vte
+   tvi950:
 
-          + moved SGR 24 and 27 from vte-2014 to vte-2012
-          + add a few capabilities fixed in recent VTE development
+          + added  function-key  definitions  to agree with Televideo 950
+            manual
+          + corrected acsc
+          + remove bogus kf0
+          + add bel
 
-   [43]xterm
+   tvi955:
 
-          + add rep to xterm-new, available since [44]late 1996.
-          + modify  xterm+256color  and  xterm+256setaf  to  use  correct
-            number of color pairs.
-          + modify    rs1    for    xterm-16color,    xterm-88color   and
-            xterm-256color  to  reset palette using oc string as in linux
-            entry.
-          + add rs1 capability to xterm-256color
-          + add  oc  capability to xterm+256color, allowing palette reset
-            for xterm
-          + add op to xterm+256setaf
-          + modify xterm-r5, xterm-r6 and xterm-xf86-v32 to use xterm+kbs
-            to match [45]xterm #272, reflecting packager's changes
-          + used  ANSI  reply for u8 in xterm-new, to reflect vt220-style
-            responses that could be returned.
-          + made xterm-pcolor sgr consistent with other capabilities
+          + fix typo
+
+   vi200:
+
+          + add acsc string, including right/down-arrow
+
+   wy50:
+
+          + corrected acsc
+
+   wy50 and wy60:
+
+          + add shifted function-keys as kF1 to kF16
+
+   xterm+x11hilite:
+
+          + eliminate unused p5 parameter.
 
    A few entries use extensions (user-defined terminal capabilities):
-     * add rmxx/smxx ECMA-48 strikeout extension to tmux and xterm-basic
-     * used RGB capability in new *-direct entries to denote direct-color
-       feature.
+     * use  xterm+sm+1006  (aka  "SGR  1006  mouse") for konsole-base and
+       putty
+     * add Smol/Rmol user-defined capability to tmux and vte-2018
+     * add Smulx user-defined capability to tmux, vte-2018
 
   Documentation
 
@@ -639,273 +402,279 @@ Release Notes
      * attempts  to  improve the description of features which users have
        found confusing
      * fills  in overlooked descriptions of features which were described
-       in the [46]NEWS file but treated sketchily in manual pages.
-
-   In particular,
-     * Since   the   underlying  features  for  [47]tset,  [48]tput,  and
-       [49]clear  have  been  better  integrated,  the  documentation now
-       includes information on how those tools evolved.
-       In  addition  to explaining the improved integration of the tools,
-       the  manual  pages made it easier to see how the tools are similar
-       and how they are different.
-     * The    addch   manual   page   has   additional   information   on
-       [50]portability and differences from other implementations.
-     * The  discussion  of  color-pairs  in the attributes manual page is
-       improved in its [51]history section.
-     * The  documentation  of the chtype, cchar_t types and the attribute
-       values  which  can  be  stored  in  those types, in particular the
-       [52]history  and [53]portability sections of the attributes manual
-       page, has been improved.
-     * improve discussion of [54]portability in the mouse manual.
-     * The   pad  manual  page  has  a  section  on  the  [55]origin  and
-       portability of pads.
-     * Differences between SVr4 and X/Open Curses soft-keys are discussed
-       in a new section on [56]portability.
-     * There   are   updated/improved   notes   on   portability  in  the
-       [57]resizeterm and [58]wresize manual pages.
+       in the NEWS file but treated sketchily in manual pages.
 
    In  addition  to  providing  background  information  to explain these
    features   and   show   how   they  evolved,  there  are  corrections,
    clarifications, etc.:
-     * add  note  in  the  [59]addch  manual  about  line-drawing when it
-       depends upon UTF-8.
-     * improve  discussion  of line-drawing characters in the [60]add_wch
-       manual.
-     * explain  in [61]clear's manual page that it writes to the standard
-       output.
-     * improve description of [62]endwin.
-     * improve  discussion  of  field  validation  in the [63]form driver
-       manual page.
-     * clarify the use of wint_t vs wchar_t in [64]get_wstr manual page.
-     * clarify  in  the  [65]getch manual that the keypad mode affects an
-       application's ability to read KEY_MOUSE codes, but does not affect
-       KEY_RESIZE.
-       trim  some  obsolete/incorrect  wording about EINTR from the getch
-       manual page
-       improve  manual  pages  for [66]getch and [67]get_wch to point out
-       that   they   might  return  user-defined  values  which  have  no
-       predefined names in <curses.h>
-     * improve  description  of  the  -R option in the [68]infocmp manual
-       page
-     * clarify in the [69]resizeterm manual page how KEY_RESIZE is pushed
-       onto the input stream.
-     * document return value of [70]use_extended_names
-     * document  differences  in [71]ESCDELAY versus AIX's implementation
-       in the variables manual page.
-     * The   _nc_free_tinfo   function   is   now   documented   in   the
-       [72]memory-leaks manual page, because it could be used in tack for
-       memory-leak checking.
-     * add a note to the [73]tic manual page about -W versus -f options.
-     * improve terminfo manual description of [74]terminfo syntax.
-       improve  terminfo  manual  page  discussion  of  [75]control-  and
-       graphics- characters.
-       improve [76]color-handling section in terminfo manual page
-     * clarify  description in [77]tput manual page regarding support for
-       termcap names
-       update  [78]tput  manual  page  to  reflect  changes to manipulate
-       terminal modes by sharing functions with tset.
-     * clarify  in manual pages that the optional verbose option level of
-       [79]tic   and  [80]infocmp  is  available  only  when  ncurses  is
-       configured for tracing.
-     * improve   manual   page   description   of  [81]tset/reset  versus
-       window-size.
-     * improve description of [82]tgoto parameters
-
-   There are new manual pages:
-     * [83]user_caps documents the terminfo extensions used by ncurses.
-     * [84]scr_dump documents the screen-dump format.
+     * Corrections:
+          + correct  error-returns  listed in manual pages for a few form
+            functions
+          + corrected  prototypes  in  several  manpages  using script to
+            extract those in compilable form.
+          + fix typo in term.5, improve explanation of format
+     * Clarify in manual pages that vwprintw and vwscanw are obsolete.
+       They have not been part of X/Open Curses since 2007.
+     * New/improved history and portability sections:
+          + curs_addch.3x gives some background for ACS symbols.
+          + curs_getcchar.3x  explains  a  difference between ncurses and
+            X/Open Curses.
+          + curs_getstr.3x  gives  historical/portability  background for
+            the length parameter of wgetnstr.
+          + curs_slk.3x  lists  a few differences between SVr4 curses and
+            X/Open Curses for soft-keys.
+          + curs_terminfo.3x  explains that the initial implementation of
+            terminfo  in  SVr2 was mostly replaced by other developers in
+            SVr3.
+          + infocmp.1  explains  that the initial version of terminfo had
+            no  tool  for decompiling descriptions. That came later, with
+            SVr3, with a different developer.
+          + tabs.1 tells more than you wanted to know about the tool.
+          + tic.1  explains  that  the  initial version of terminfo had a
+            rudimentary  tool  (based  on termcap) for compiling entries.
+            The tool used with Unix was developed by others for SVr3.
+          + toe.1 explains the origin of this tool.
+     * Improvements for user_caps.5:
+          + mention meml, memu and box1
+          + expanded description of XM
+          + add a clarification regarding the RGB capability.
+          + mention user_caps.5 in the tic and infocmp manual pages.
+     * Other improvements:
+          + curs_add_wch.3x  adds  note about Unicode terminology for the
+            line-drawing characters.
+          + curs_color.3x   improves  discussion  of  error  returns  and
+            extensions.
+          + curs_mouse.3x  explains how the kmous and XM capabilities are
+            used for xterm-mouse input.
+          + curs_refresh.3x  improves documentation regarding the virtual
+            and physical screens.
+          + curs_util.3x  mentions  a  difference between SVr4 and X/Open
+            Curses for unctrl.h
+          + curs_variables.3x   improves  description  of  the  init_tabs
+            capability and TABSIZE variable.
+          + ncurses.3x   improves  documentation  regarding  feature-test
+            macros in curses.h
+          + resizeterm.3x   about   top-level  windows  which  touch  the
+            screen's borders.
+          + tput.1 clarifies how tput determines the terminal size.
+
+   There  are  no new manual pages (all of the manual page updates are to
+   existing pages).
 
    Some  of  the  improvements  are  more subtle, relating to the way the
-   information is presented:
-     * Made minor fixes to manpage NAME/SYNOPSIS sections to consistently
-       use  rule  that  either  all  functions  which  are  prototyped in
-       SYNOPSIS  are  listed in the NAME section, or the manual-page name
-       is the sole item listed in the NAME section. The latter is used to
-       reduce  clutter,  e.g.,  for the top-level library manual pages as
-       well  as  for  certain  feature-pages  such  as  [85]SP-funcs  and
-       [86]threading.
-     * improve  manual  pages  for utilities with respect to POSIX versus
-       X/Open Curses.
-     * improve  organization  of  the [87]attributes and [88]color manual
-       pages.
+   information  is presented. For instance, the generated terminfo.5 file
+   uses  a  different  table  layout,  allowing  it  to use space on wide
+   terminals more effectively.
 
   Interesting bug-fixes
 
-     * modify  toe  to not exit if unable to read a terminal description,
-       e.g., if there is a permission problem.
-     * correct 20100515 change for weak signals versus sigprocmask
-     * work  around  Ada  tool-breakage in Debian 9 and later by invoking
-       gprconfig  to  specify  the C compiler to be used by gnatmake, and
-       conditionally   suppressing   Library_Options   line   for  static
-       libraries.
-     * There were, as well, several bug-fixes to handle illegal input for
-       tic.   Because   those  did  not  correspond  to  useful  terminal
-       descriptions, most users are unaffected.
+   While  there  were  many bugs fixed during development of ncurses 6.2,
+   only  a  few  (the  reason  for  this release) were both important and
+   interesting. Most of the bug-fixes were for local issues which did not
+   affect  compatibility across releases. Since those are detailed in the
+   NEWS file no elaboration is needed here.
+
+   The  interesting  bugs  were in tic/infocmp's handling of user-defined
+   capabilities.  These  were  not recent bugs. Initially it was a simple
+   problem:
+     * The  user-defined capabilities can be any type (boolean, number or
+       string),  but  once given a type all uses of the name must conform
+       to  that  type--unless  some  special  support  for  a  particular
+       multi-typed name is built into ncurses.
+     * One of simpleterm's contributors copied some definitions for using
+       tmux's user-defined capabilities in late in 2016.
+
+diff --git a/st.info b/st.info
+@@ -185,7 +185,10 @@ st| simpleterm,
+  tsl=\E]0;,
+  xenl,
+  vpa=\E[%i%p1%dd,
+-
++# Tmux unofficial extensions, see TERMINFO EXTENSIONS in tmux(1)
++ Se,
++ Ss,
++ Tc,
+
+ st-256color| simpleterm with 256 colors,
+  use=st,
+
+     * Later,  in (referring to a version from mid-2017), a user asked to
+       have it updated in ncurses.
+     * However,  it  had  an  error  from  the  change  in late 2016. The
+       terminal description made what tmux expected to be string actually
+       a boolean.
+       Over  the  years,  there  were  problems with each of simpleterm's
+       terminal  descriptions.  I  repaired those, and usually dealt with
+       the problem.
+     * The  difference  in this case was that when compiling the terminal
+       database, tic may have in memory the definitions for more than one
+       terminal  description  (so  that  it  can resolve "use=" clauses).
+       Seeing   two  different  types  for  the  same  name,  in  certain
+       situations  it  would  incorrectly merge the symbol tables for the
+       two terminal descriptions.
+     * On  simpleterm's  side,  their bug was finally fixed in late 2019,
+       three years after the bug was created.
+
+   For  ncurses,  the  elapsed  time  to fix this bug was less than three
+   years.  Someone reported a problem with the terminal description a few
+   weeks  after  releasing  ncurses 6.1 (in tmux #1264), and the terminal
+   description was updated that week (ncurses patch 20180224):
+
+20180224
+        + modify _nc_resolve_uses2() to detect incompatible types when merging
+          a "use=" clause of extended capabilities.  The problem was seen in a
+          defective terminfo integrated from simpleterm sources in 20171111,
+          compounded by repair in 20180121.
+        + correct Ss/Ms interchange in st-0.7 entry (tmux #1264) -TD
+
+   The larger part of that change added a check to prevent a simple merge
+   of  terminal  descriptions  where  the same user-defined name was used
+   with different types. But it raised some questions:
+     * Was  there  a  reliable  way to manage terminal descriptions which
+       used the same extended name in different ways?
+     * Should  ncurses  provide  a registry of well-known extended names,
+       with their types?
+
+   Since  the  correction to terminfo.src could have been readily adopted
+   by  packagers,  there  was  nothing  more  to  be  done  from ncurses'
+   standpoint  on that part. But improving ncurses to prevent issues like
+   that is the reason for making a release.
+
+   Nothing  more  (constructive) was mentioned with regard to simpleterm.
+   But  a  few  problems  were  found  in  the  handling  of user-defined
+   capabilities:
+     * Forward-references to user-defined capabilities in a "use=" clause
+       did  not  allocate  new  data  for  each  use.  In tic, successive
+       compilation   of   terminal   entries   could   add   user-defined
+       capabilities to the wrong terminal entry.
+       This  was  not noticed before, since xterm's terminal descriptions
+       were  the main users of the feature, and almost all of the uses of
+       the building-blocks which contained user-defined capabilities were
+       backward-references.
+     * There  is  one  (documented)  case  where  ncurses  6.1 supports a
+       user-defined  capability that could be any type (i.e., "RGB"). The
+       check  added  in February 2018 to guard against mismatches did not
+       handle all of the combinations needed.
+
+   Both  of  these  issues  dated  from  the  original  implementation of
+   user-defined  capabilities.  Fixing  them does not change the terminal
+   database, but a older tic without the fixes will not be able to handle
+   terminfo  sources  which rely upon those fixes. Starting in June 2019,
+   the  download  link  for  the  terminfo source file was capped at that
+   date. The development sources have an up-to-date copy of the file, for
+   people with a legitimate need for it.
+
+   The  "-c"  (check) option of tic is not very useful if it cannot offer
+   advice on parameters needed for user-defined capabilities. The various
+   Caps  files  were  reorganized to reduce redundancy, and in the common
+   portion  (Caps-ncurses),  a  registry  of user-defined capabilities is
+   provided for use by tic. While users can still define their own custom
+   capabilities,  tic  will not offer any advice when their parameters do
+   not match.
+
+   In  ncurses  6.2, tic makes a special check to allow any type for RGB,
+   but  its  being  able to do this relies upon fixes made in the ncurses
+   library in mid-2019.
 
   Configuration changes
 
     Major changes
 
-   This  release  provides  a new binary format for terminal descriptions
-   that  use  extended  numeric capabilities. Applications built with the
-   wide-character ncursesw library can use these extended numbers.
-     * This includes utilities such as tic and infocmp, because (as noted
-       in  [89]New features), the feature relies upon an extension to the
-       low-level tinfo library.
-     * A  few  software  packagers  use a configuration option of ncurses
-       which  allows the low-level tinfo library to be shared between the
-       high-level  ncurses  and  ncursesw libraries. This new feature was
-       designed to work in that configuration as well.
-
-   Other  applications (i.e., using the 8-bit ncurses library) which read
-   the  extended terminal descriptions see those numeric capabilities set
-   to the maximum value for a signed 16-bit number.
-
-   Older   versions   of   ncurses'   tic   accept  out-of-range  numeric
-   capabilities,  storing  those as the maximum value for a signed 16-bit
-   number.  Other  implementations of curses (mentioned in the discussion
-   of [90]picsmap) give zero for these out-of-range capabilities.
+   There  are  no  major  changes. Several new options were added to ease
+   integration  of packages with systems using different versions of GNAT
+   and ncurses. Also, improvements were made to configure checks.
 
     Configuration options
 
-   These  changes  provide  support  for  tack 1.08, released in [91]July
-   2017:
-     * add   --without-tack   configure  option  to  refine  --with-progs
-       configure option. Normally tack is built outside the ncurses tree,
-       but  a  few packagers combine it during the build. If term_entry.h
-       is installed, there is no advantage to in-tree builds.
-     * adjust   configure-script   to  define  HAVE_CURSES_DATA_BOOLNAMES
-       symbol  needed  for  tack  1.08  when  built  in-tree. Rather than
-       relying upon internal "_nc_" functions, tack now uses the boolean,
-       number  and  string capability name-arrays provided by ncurses and
-       SVr4  Unix  curses. It still uses term_entry.h for the definitions
-       of the extended capability arrays.
-     * add  dependency  upon  ncurses_cfg.h  to  tic's  header-files; any
-       program  using  tic-library  will have to supply this file. Legacy
-       tack  versions  supply  this  file;  ongoing  tack development has
-       dropped  the dependency upon tic-library and new releases will not
-       be affected.
-
-   Other changes to the configure-script and generated files include
-     * add  configure  options to disable checks for form, menu and panel
-       libraries  so  that  ncurses-examples  can  be built with non-SVr4
-       curses implementations.
-     * add  configure  option  --enable-opaque-curses for ncurses library
-       and similar options for the other libraries.
-     * add configure option --disable-wattr-macros for use in cases where
-       one   wants   to   use  the  same  headers  for  ncurses5/ncurses6
-       development,  by suppressing the wattr* macros which differ due to
-       the introduction of extended colors
-     * modify  configure macro for shared-library rules to use -Wl,-rpath
-       rather than -rpath to work around a bug in scons
-     * improve  ncurses-examples'  configure  script  to define as needed
-       NCURSES_WIDECHAR  for  platforms where _XOPEN_SOURCE_EXTENDED does
-       not  work.  Also  modified  the  test  program  to  ensure that if
-       building  with  ncurses,  that  the cchar_t type is checked, since
-       that  is  normally  (since [92]20111030) ifdef'd depending on this
-       test.
-     * modify  configure  script  to handle the case where tic-library is
-       renamed,  but  the  --with-debug  option is used by itself without
-       normal or shared libraries
-     * modify  editing  script which generates resulting.map to work with
-       the clang configuration on recent FreeBSD, which gives an error on
-       an empty "local" section.
-     * improve configure check for setting the WILDCARD_SYMS variable; on
-       ppc64 the variable is in the Data section rather than Text.
-     * correct  result  of  configure  option  --without-fallbacks, which
-       caused FALLBACK_LIST to be set to "no"
-     * modify  --with-pkg-config-libdir  option  to  make  it possible to
-       install  ".pc"  files  even if pkg-config is not found. Limit this
-       change,  to suppress the actual install if it is not overridden to
-       a valid directory at install time.
-     * disallow "no" as a possible value for --with-shlib-version option,
-       overlooked in cleanup-changes for [93]20000708.
+   There are a few new/modified configure options:
+
+   --with-config-suffix
+          helps  work  around  a  filename  conflict with Debian packages
+          versus test-packages.
+
+   --with-ada-libname
+          allows  one  to  rename  the  "AdaCurses" library (at least one
+          packager prefers a lowercase name).
+
+   --with-fallbacks
+          now ensures there is a value, and adds the fallback information
+          to top-level Makefile summary.
+
+   --with-pcre2
+          check for pcre-posix library to help with MinGW port.
+
+   --with-tic-path and
+
+   --with-infocmp-path
+          help  work  around  problems  building  fallback  source  using
+          pre-6.0 tic/infocmp.
+
+   --with-versioned-syms
+          option value can now be a relative pathname.
 
   Portability
 
    Many  of  the  portability  changes  are implemented via the configure
    script:
-     * improve  configure  script's  CF_CC_ENV_FLAGS  macro  to allow for
-       compiler  wrappers  such  as  ccache.  This  change moves only the
-       preprocessor,  optimization  and  warning  flags  to  CPPFLAGS and
-       CFLAGS,  leaving the residue in CC. That happens to work for gcc's
-       various   "model"  options,  but  may  require  tuning  for  other
-       compilers.
-     * modify  ncurses-examples'  configure  script to use pkg-config for
-       the  extra  form/menu/panel  libraries, to be more consistent with
-       the handling of the curses/ncurses library.
-     * add  configuration  checks  to build with [94]NetBSD curses, which
-       for example lacks [95]use_env.
-     * change  ncurses-examples  to use attr_t vs chtype to follow X/Open
-       documentation   more   closely   since  Solaris  xpg4-curses  uses
-       different  values for WA_xxx vs A_xxx that rely on attr_t being an
-       unsigned  short.  Tru64  aka  OSF1, HPUX, AIX did as ncurses does,
-       equating the two sets.
-     * modify  several  test  programs  to  reflect  that  ncurses honors
-       existing  signal  handlers in initscr, while other implementations
-       do not.
-     * add  configure  check  for  openpty to ncurses-examples' configure
-       script, for ditto.
-     * improve check for working poll function by using posix_openpt as a
-       fallback in case there is no valid terminal on the standard input
-     * modify  ncurses-examples'  configure  script  to check for pthread
-       dependency  of  ncursest  or  ncursestw  library when building the
-       ncurses examples, e.g., in case weak symbols are used.
-     * add   checks   in  ncurses-examples'  configure  script  for  some
-       functions neither in 4.3BSD curses, nor based on X/Open Curses:
-          + modify  a  loop limit in firework.c to work around absense of
-            limit checks in some libraries.
-          + fill the last row of a window with "?" in firstlast if waddch
-            does not return ERR on the lower-right corner.
-     * build-fixes for the Portland Group (PGI) compilers
-          + accept whitespace in sed expression for generating expanded.c
-          + modify  configure  check  that  g++ compiler warnings are not
-            used.
-          + add  configure  check  for  -fPIC  option  needed  for shared
-            libraries.
-     * modify  configure  script  for  clang  as used on FreeBSD, to work
-       around clang's differences in exit codes vs gcc.
-     * fixes for configure/build using clang on OSX
-          + do   not   redefine   "inline"  in  ncurses_cfg.h;  this  was
-            originally to solve a problem with gcc/g++, but is aggravated
-            by clang's misuse of symbols to pretend it is gcc.
-          + add  braces  to configure script to prevent unwanted addition
-            of "-lstdc++" option to the CXXLIBS symbol.
-          + improve/update  test-program  used  for checking existence of
-            stdc++ library.
-          + if $CXXLIBS is set, the linkage test uses that in addition to
-            $LIBS.
-     * fixes for OS/2:
-          + use  button  instead  of  kbuf[0]  in  EMX-specific  part  of
-            lib_mouse.c
-          + support building with libtool on OS/2
-          + use stdc++ library with OS/2 kLIBC
-          + clear  configure  script's  cf_XOPEN_SOURCE for OS/2, to work
-            with its header files
-     * add  "newer"  baudrate symbols to the [96]baudrate function in the
-       ncurses library as well as to a corresponding table in tset.
-     * modify ncurses-examples savescreen to work with AIX and HPUX.
-     * define WIN32_LEAN_AND_MEAN for MinGW port, making builds faster.
-     * add  a configure check for wcwidth versus the ncurses line-drawing
-       characters,  to  use  in  special-casing  systems such as Solaris.
-       Solaris,  however,  requires  a  special  case  that  maps Unicode
-       line-drawing  characters  into  the  acsc  string  for non-Unicode
-       locales.  Solaris also has a misconfigured wcwidth which marks all
-       of the line drawing characters as double-width.
-     * string-hacks (non-standard):
-          + fix  configure  script  to  record  when  strlcat is found on
-            OpenBSD.
-          + add   --enable-string-hacks   option   to   ncurses-examples'
-            configure script.
-          + completed  string-hacks  for  sprintf,  etc.,  including  the
-            ncurses-examples programs.
-          + make   --enable-string-hacks   option  work  with  Debian  by
-            checking   for   the   "bsd"   library   and  its  associated
-            "<bsd/string.h>" header.
-     * workaround for Debian's antique/unmaintained version of mawk:
-          + see  Debian  #65617,  which  was  fixed  in  mawk's  upstream
-            releases in [97]2009.
-          + related fixes when building link_test.
+     * ignore $TERMINFO as a default value in configure script if it came
+       from the infocmp -Q option.
+     * distinguish  gcc  from  icc  and  clang when the --enable-warnings
+       option   is   not   used,  to  avoid  unnecessary  warnings  about
+       unrecognized inline options
+     * consistently  prepend  new  libraries  as  they  are  found during
+       configuration,  rather  than  relying  upon  the linker to resolve
+       order dependencies of libraries.
+     * modified  configure  scripts  to  reduce  relinking/ranlib  during
+       library install :
+          + use  "install -p" when available, to avoid need for ranlib of
+            static libraries.
+          + scripts which use "--disable-relink;" add a 1-second sleep to
+            work around tools which use whole-second timestamps, e.g., in
+            utime rather than the actual file system resolution.
+     * add configure check for getenv to work around implementation shown
+       in  Emscripten  which overwrites the previous return value on each
+       call.
+       Use  that  to optionally suppress START_TRACE macro, whose call to
+       getenv may not work properly
+     * change  target configure level for _XOPEN_SOURCE to 600 to address
+       use of vsscanf and setenv.
+     * reduce  use of _GNU_SOURCE for current glibc where _DEFAULT_SOURCE
+       combines with _XOPEN_SOURCE
+       Allow  for  Cygwin's  newlib when checking for the _DEFAULT_SOURCE
+       symbol.
+       MidnightBSD   is   now   checked   for  the  _XOPEN_SOURCE-related
+       definitions.
+     * If the check for va_copy or __va_copy fails,
+          + configure  now  tries copying the pointers for va_list, or as
+            an array.
+          + alternatively, it checks for __builtin_va_copy(), which could
+            be used with AIX xlc in c89 mode.
+     * several changes to support a port to Ultrix 3.1:
+          + check if "b" binary feature of fopen works
+          + check for missing feature of locale.h
+          + add fallback for strstr() in test-programs
+          + add fallback for STDOUT_FILENO in test-programs
+     * The test/configure script (used for ncurses-examples) is improved:
+          + work around non-ncurses termcap.h file, e.g., in Slackware.
+          + check for TABSIZE variable.
+          + checks  for  the  X11/Intrinsic.h  header, accommodate recent
+            MacOS changes which largely emptied /usr/include.
+
+   Here are some of the other portability fixes:
+     * added  dummy  "check"  rule  in  top-level  and  test-Makefile  to
+       simplify building test-packages for ArchLinux.
+     * dropped   library-dependency   on  psapi  for  MinGW  port,  since
+       win_driver.c   defines   PSAPI_VERSION   to   2,   making  it  use
+       GetProcessImageFileName from kernel32.dll
+     * made  build-fixes  for  configuration  using --program-suffix with
+       Ada95,  noticed  with  MacOS  but  applicable  to  other platforms
+       without libpanelw, etc.
+     * modified  ncurses/Makefile.in  to  fix a case where Debian/testing
+       changes to the ld --as-needed configuration broke ncurses-examples
+       test packages.
+     * used   _WIN32/_WIN64   in  preference  to  __MINGW32__/__MINGW64__
+       symbols  to simplify building with Microsoft Visual C++, since the
+       former are defined in both compiler configurations.
      _________________________________________________________________
 
 Features of ncurses
@@ -982,10 +751,10 @@ Features of ncurses
        types  even  when  no  terminfo tree or termcap file is accessible
        (this  may  be useful for support of screen-oriented programs that
        must run in single-user mode).
-     * The  [98]tic/[99]captoinfo  utility  provided with ncurses has the
-       ability  to  translate  many termcaps from the XENIX, IBM and AT&T
-       extension sets.
-     * A BSD-like [100]tset utility is provided.
+     * The tic/captoinfo utility provided with ncurses has the ability to
+       translate  many  termcaps  from  the XENIX, IBM and AT&T extension
+       sets.
+     * A BSD-like tset utility is provided.
      * The ncurses library and utilities will automatically read terminfo
        entries  from  $HOME/.terminfo  if  it exists, and compile to that
        directory  if  it  exists  and the user has no write access to the
@@ -1000,20 +769,20 @@ Features of ncurses
        other entries in the same source file (as in System V) but also to
        compiled  entries  in  either the system terminfo directory or the
        user's $HOME/.terminfo directory.
-     * The  table-of-entries  utility [101]toe makes it easy for users to
-       see exactly what terminal types are available on the system.
+     * The  table-of-entries  utility  toe makes it easy for users to see
+       exactly what terminal types are available on the system.
      * The library meets the XSI requirement that every macro entry point
        have  a  corresponding  function  which may be linked (and will be
        prototype-checked)  if  the  macro  definition  is  disabled  with
        #undef.
-     * Extensive  documentation  is  provided  (see  the  [102]Additional
-       Reading section of the [103]ncurses FAQ for online documentation).
+     * Extensive  documentation  is  provided (see the Additional Reading
+       section of the ncurses FAQ for online documentation).
 
 Applications using ncurses
 
    The  ncurses  distribution  includes  a  selection  of  test  programs
    (including   a   few   games).   These  are  available  separately  as
-   [104]ncurses-examples
+   ncurses-examples
 
    The   ncurses   library  has  been  tested  with  a  wide  variety  of
    applications including:
@@ -1021,127 +790,131 @@ Applications using ncurses
    aptitude
           FrontEnd to Apt, the debian package manager
 
-          [105]https://wiki.debian.org/Aptitude
+          https://wiki.debian.org/Aptitude
 
    cdk
           Curses Development Kit
 
-          [106]https://invisible-island.net/cdk/
+          https://invisible-island.net/cdk/
 
    ded
           directory-editor
 
-          [107]https://invisible-island.net/ded/
+          https://invisible-island.net/ded/
 
    dialog
           the  underlying  application used in Slackware's setup, and the
           basis   for  similar  install/configure  applications  on  many
           systems.
 
-          [108]https://invisible-island.net/dialog/
+          https://invisible-island.net/dialog/
 
    lynx
           the text WWW browser
 
-          [109]https://lynx.invisible-island.net/
+          https://lynx.invisible-island.net/
 
    mutt
           mail utility
 
-          [110]http://www.mutt.org/
+          http://www.mutt.org/
 
    ncftp
           file-transfer utility
 
-          [111]https://www.ncftp.com/
+          https://www.ncftp.com/
 
    nvi
           New vi uses ncurses.
 
-          [112]https://sites.google.com/a/bostic.com/keithbostic/vi
+          https://sites.google.com/a/bostic.com/keithbostic/vi
 
    ranger
           A console file manager with VI key bindings in Python.
 
-          [113]https://ranger.github.io/
+          https://ranger.github.io/
 
    tin
           newsreader, supporting color, MIME
 
-          [114]http://www.tin.org/
+          http://www.tin.org/
 
    vifm
           File manager with vi like keybindings
 
-          [115]https://vifm.info/
+          https://vifm.info/
 
    as well as some that use ncurses for the terminfo support alone:
 
    minicom
           terminal emulator for serial modem connections
 
-          [116]https://alioth.debian.org/projects/minicom/
+          https://alioth.debian.org/projects/minicom/
 
    mosh
           a replacement for ssh.
 
-          [117]https://mosh.mit.edu/
+          https://mosh.mit.edu/
 
    tack
           terminfo action checker
 
-          [118]https://invisible-island.net/ncurses/tack.html
+          https://invisible-island.net/ncurses/tack.html
 
    tmux
           terminal multiplexor
 
-          [119]https://github.com/tmux/tmux/wiki
+          https://github.com/tmux/tmux/wiki
 
    vile
           vi-like-emacs  may  be  built  to  use the terminfo, termcap or
           curses interfaces.
 
-          [120]https://invisible-island.net/vile/
+          https://invisible-island.net/vile/
 
    and finally, those which use only the termcap interface:
 
    emacs
           text editor
 
-          [121]https://www.gnu.org/software/emacs/
+          https://www.gnu.org/software/emacs/
 
    less
           The  most  commonly  used  pager  (a program that displays text
           files).
 
-          [122]http://www.greenwoodsoftware.com/less/
+          http://www.greenwoodsoftware.com/less/
 
    screen
           terminal multiplexor
 
-          [123]https://www.gnu.org/software/screen/
+          https://www.gnu.org/software/screen/
 
    vim
           text editor
 
-          [124]https://www.vim.org/
+          https://www.vim.org/
 
 Development activities
 
    Zeyd  Ben-Halim  started  ncurses  from  a  previous  package pcurses,
    written  by  Pavel  Curtis.  Eric  S.  Raymond  continued development.
-   Juergen  Pfeifer  wrote  most  of the form and menu libraries. Ongoing
-   development  work  is  done  by [125]Thomas Dickey. Thomas Dickey also
-   acts  as  the maintainer for the Free Software Foundation, which holds
-   the [126]copyright on ncurses.
+   Juergen Pfeifer wrote most of the form and menu libraries.
+
+   Ongoing development work is done by Thomas E. Dickey. Thomas E. Dickey
+   has  acted  as  the maintainer for the Free Software Foundation, which
+   holds  a  copyright on ncurses for releases 4.2 through 6.1. Following
+   the release of ncurses 6.1, effective as of release 6.2, copyright for
+   ncurses  reverted  to  Thomas  E.  Dickey  (see  the  ncurses  FAQ for
+   additional information).
 
    Contact the current maintainers at
 
-     [127]bug-ncurses@gnu.org
+     bug-ncurses@gnu.org
 
    To join the ncurses mailing list, please write email to
 
-     [128]bug-ncurses-request@gnu.org
+     bug-ncurses-request@gnu.org
 
    containing the line:
 
@@ -1150,219 +923,60 @@ Development activities
    This list is open to anyone interested in helping with the development
    and testing of this package.
 
-   Beta  versions  of ncurses and patches to the current release are made
-   available at
+   Beta versions of ncurses are made available at
+
+     ftp://ftp.invisible-island.net/ncurses/current/ and
+     https://invisible-mirror.net/archives/ncurses/current/ .
+
+   Patches to the current release are made available at
 
-     [129]ftp://ftp.invisible-island.net/ncurses/ and
-     [130]https://invisible-mirror.net/archives/ncurses/ .
+     ftp://ftp.invisible-island.net/ncurses/6.1/ and
+     https://invisible-mirror.net/archives/ncurses/6.1/ .
 
    There is an archive of the mailing list here:
 
-     [131]http://lists.gnu.org/archive/html/bug-ncurses            (also
-     [132]https)
+     http://lists.gnu.org/archive/html/bug-ncurses (also https)
 
 Related resources
 
    The  release notes make scattered references to these pages, which may
    be interesting by themselves:
-     * [133]ncurses licensing
-     * [134]Symbol versioning in ncurses
-     * [135]Comments on ncurses versus slang (S-Lang)
-     * [136]tack - terminfo action checker
-     * [137]tctest - termcap library checker
-     * [138]Terminal Database
+     * ncurses licensing
+     * Symbol versioning in ncurses
+     * Comments on ncurses versus slang (S-Lang)
+     * tack - terminfo action checker
+     * tctest - termcap library checker
+     * Terminal Database
 
 Other resources
 
    The  distribution  provides  a  newer  version  of the terminfo-format
-   terminal  description  file  once  maintained  by  [139]Eric Raymond .
-   Unlike  the  older version, the termcap and terminfo data are provided
-   in   the   same  file,  which  also  provides  several  user-definable
-   extensions beyond the X/Open specification.
+   terminal description file once maintained by Eric Raymond . Unlike the
+   older  version, the termcap and terminfo data are provided in the same
+   file, which also provides several user-definable extensions beyond the
+   X/Open specification.
 
    You  can  find  lots  of  information  on  terminal-related topics not
-   covered in the terminfo file at [140]Richard Shuford's archive .
-
-     * [141]Overview
-     * [142]Release Notes
-          + [143]Library improvements
-               o [144]New features
-               o [145]Other improvements
-          + [146]Program improvements
-               o [147]Utilities
-               o [148]Examples
-          + [149]Terminal database
-          + [150]Documentation
-          + [151]Interesting bug-fixes
-          + [152]Configuration changes
-               o [153]Major changes
-               o [154]Configuration options
-          + [155]Portability
-     * [156]Features of ncurses
-     * [157]Applications using ncurses
-     * [158]Development activities
-     * [159]Related resources
-     * [160]Other resources
-
-References
-
-   1. https://invisible-island.net/ncurses/man/captoinfo.1m.html
-   2. https://invisible-island.net/ncurses/man/clear.1.html
-   3. https://invisible-island.net/ncurses/man/infocmp.1m.html
-   4. https://invisible-island.net/ncurses/man/tabs.1.html
-   5. https://invisible-island.net/ncurses/man/tic.1m.html
-   6. https://invisible-island.net/ncurses/man/toe.1m.html
-   7. https://invisible-island.net/ncurses/man/tput.1.html
-   8. https://invisible-island.net/ncurses/man/tset.1.html
-   9. https://invisible-island.net/ncurses/
-  10. ftp://ftp.invisible-island.net/ncurses/
-  11. https://invisible-mirror.net/archives/ncurses/
-  12. ftp://ftp.gnu.org/gnu/ncurses/
-  13. https://invisible-island.net/ncurses/man/curs_kernel.3x.html#h3-def_prog_mode_-def_shell_mode
-  14. https://invisible-island.net/ncurses/ncurses-mapsyms.html
-  15. https://invisible-island.net/ncurses/tctest.html#bsd42-numeric-caps
-  16. https://invisible-island.net/ncurses/ncurses-slang.html#cause_numbers
-  17. https://invisible-island.net/ncurses/tack.html#portable
-  18. https://invisible-island.net/ncurses/tack/CHANGES.html#index-t20170726
-  19. https://invisible-island.net/ncurses/man/curs_attr.3x.html#h2-EXTENSIONS
-  20. https://invisible-island.net/ncurses/man/tset.1.html#h3-reset---reinitialization
-  21. https://invisible-island.net/ncurses/man/tset.1.html
-  22. https://invisible-island.net/ncurses/man/tput.1.html
-  23. https://invisible-island.net/ncurses/man/tset.1.html#h3-reset---reinitialization
-  24. https://invisible-island.net/ncurses/man/clear.1.html
-  25. https://invisible-island.net/ncurses/tctest.html#bsd42-ctl-question
-  26. https://invisible-island.net/ncurses/tctest.html#freebsd-ctl-question
-  27. https://invisible-island.net/ncurses/ncurses-examples.html
-  28. https://invisible-island.net/ncurses/man/new_pair.3x.html#h3-alloc_pair
-  29. https://invisible-island.net/ncurses/man/new_pair.3x.html#h3-find_pair
-  30. https://invisible-island.net/ncurses/man/new_pair.3x.html#h3-free_pair
-  31. https://invisible-island.net/ncurses/ncurses-slang.html#compare_picsmap
-  32. https://invisible-island.net/dialog/
-  33. https://invisible-island.net/dialog/manpage/dialog.html#h3-Common-Options
-  34. https://invisible-island.net/xterm/xterm.log.html#xterm_331
-  35. https://invisible-island.net/ncurses/terminfo.src.html#toc-_A_N_S_I__S_Y_S__I_S_O_6429__E_C_M_A-48__Capabilities
-  36. https://invisible-island.net/ncurses/terminfo.src.html#tic-icl6404
-  37. https://invisible-island.net/ncurses/terminfo.src.html#tic-interix
-  38. https://invisible-island.net/ncurses/terminfo.src.html#toc-_Linux_consoles
-  39. https://invisible-island.net/ncurses/terminfo.src.html#toc-_Open_B_S_D_consoles
-  40. https://invisible-island.net/ncurses/terminfo.src.html#toc-_Tmux
-  41. https://invisible-island.net/ncurses/terminfo.src.html#toc-_D_E_C__V_T100_and_compatibles
-  42. https://invisible-island.net/ncurses/terminfo.src.html#toc-_G_N_O_M_E__V_T_E_
-  43. https://invisible-island.net/ncurses/terminfo.src.html#toc-_X_T_E_R_M
-  44. https://invisible-island.net/xterm/xterm.log.html#xterm_32
-  45. https://invisible-island.net/xterm/xterm.log.html#xterm_272
-  46. https://invisible-island.net/ncurses/NEWS.html
-  47. https://invisible-island.net/ncurses/man/clear.1.html#h2-HISTORY
-  48. https://invisible-island.net/ncurses/man/clear.1.html#h2-HISTORY
-  49. https://invisible-island.net/ncurses/man/clear.1.html#h2-HISTORY
-  50. https://invisible-island.net/ncurses/man/curs_addch.3x.html#h2-PORTABILITY
-  51. https://invisible-island.net/ncurses/man/curs_attr.3x.html#h2-HISTORY
-  52. https://invisible-island.net/ncurses/man/curs_attr.3x.html#h2-HISTORY
-  53. https://invisible-island.net/ncurses/man/curs_attr.3x.html#h2-PORTABILITY
-  54. https://invisible-island.net/ncurses/man/curs_mouse.3x.html#h2-PORTABILITY
-  55. https://invisible-island.net/ncurses/man/curs_pad.3x.html#h2-PORTABILITY
-  56. https://invisible-island.net/ncurses/man/curs_slk.3x.html#h2-PORTABILITY
-  57. https://invisible-island.net/ncurses/man/resizeterm.3x.html#h2-PORTABILITY
-  58. https://invisible-island.net/ncurses/man/wresize.3x.html#h2-PORTABILITY
-  59. https://invisible-island.net/ncurses/man/curs_addch.3x.html#h3-ACS-Symbols
-  60. https://invisible-island.net/ncurses/man/curs_add_wch.3x.html
-  61. https://invisible-island.net/ncurses/man/clear.1.html#h2-DESCRIPTION
-  62. https://invisible-island.net/ncurses/man/curs_initscr.3x.html#h3-endwin
-  63. https://invisible-island.net/ncurses/man/form_driver.3x.html
-  64. https://invisible-island.net/ncurses/man/curs_get_wstr.3x.html#h2-RETURN-VALUE
-  65. https://invisible-island.net/ncurses/man/curs_getch.3x.html#h3-Predefined-key-codes
-  66. https://invisible-island.net/ncurses/man/curs_getch.3x.html#h3-Keypad-Mode
-  67. https://invisible-island.net/ncurses/man/curs_get_wch.3x.html#h2-DESCRIPTION
-  68. https://invisible-island.net/ncurses/man/infocmp.1m.html
-  69. https://invisible-island.net/ncurses/man/resizeterm.3x.html#h2-NOTES
-  70. https://invisible-island.net/ncurses/man/curs_extend.3x#h2-RETURN-VALUE
-  71. https://invisible-island.net/ncurses/man/curs_variables.3x.html#h2-PORTABILITY
-  72. https://invisible-island.net/ncurses/man/curs_memleaks.3x.html
-  73. https://invisible-island.net/ncurses/man/tic.1m.html
-  74. https://invisible-island.net/ncurses/man/terminfo.5.html#h3-Terminfo-Capabilities-Syntax
-  75. https://invisible-island.net/ncurses/man/terminfo.5.html#h3-Line-Graphics
-  76. https://invisible-island.net/ncurses/man/terminfo.5.html#h3-Color-Handling
-  77. https://invisible-island.net/ncurses/man/tput.1.html#h2-PORTABILITY
-  78. https://invisible-island.net/ncurses/man/tput.1.html#h3-Aliases
-  79. https://invisible-island.net/ncurses/man/tic.1m.html#h2-OPTIONS
-  80. https://invisible-island.net/ncurses/man/infocmp.1m.html#h3-Other-Options
-  81. https://invisible-island.net/ncurses/man/tset.1.html
-  82. https://invisible-island.net/ncurses/man/curs_termcap.3x.html#h3-FORMATTING-CAPABILITIES
-  83. https://invisible-island.net/ncurses/man/user_caps.5.html
-  84. https://invisible-island.net/ncurses/man/scr_dump.5.html
-  85. https://invisible-island.net/ncurses/man/curs_sp_funcs.3x.html
-  86. https://invisible-island.net/ncurses/man/curs_threads.3x.html
-  87. https://invisible-island.net/ncurses/man/curs_attr.3x.html
-  88. file:///ncurses/man/curs_color.3x.html
-  89. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h4-new-library
-  90. https://invisible-island.net/ncurses/ncurses-slang.html#compare_picsmap
-  91. https://invisible-island.net/ncurses/tack/CHANGES.html#index-t20170726
-  92. https://invisible-island.net/ncurses/NEWS.html#t20111030
-  93. https://invisible-island.net/ncurses/NEWS.html#t20000708
-  94. https://invisible-island.net/ncurses/ncurses-netbsd.html
-  95. https://invisible-island.net/ncurses/man/curs_util.3x.html#h3-use_env
-  96. https://invisible-island.net/ncurses/man/curs_termattrs.3x.html#h3-baudrate
-  97. https://invisible-island.net/mawk/CHANGES.html#t20090727
-  98. https://invisible-island.net/ncurses/man/tic.1m.html
-  99. https://invisible-island.net/ncurses/man/captoinfo.1m.html
- 100. https://invisible-island.net/ncurses/man/tset.1.html
- 101. https://invisible-island.net/ncurses/man/toe.1m.html
- 102. https://invisible-island.net/ncurses/ncurses.faq.html#additional_reading
- 103. https://invisible-island.net/ncurses/ncurses.faq.html
- 104. https://invisible-island.net/ncurses/ncurses-examples.html
- 105. https://wiki.debian.org/Aptitude
- 106. https://invisible-island.net/cdk/
- 107. https://invisible-island.net/ded/
- 108. https://invisible-island.net/dialog/
- 109. https://lynx.invisible-island.net/
- 110. http://www.mutt.org/
- 111. https://www.ncftp.com/
- 112. https://sites.google.com/a/bostic.com/keithbostic/vi
- 113. https://ranger.github.io/
- 114. http://www.tin.org/
- 115. https://vifm.info/
- 116. https://alioth.debian.org/projects/minicom/
- 117. https://mosh.mit.edu/
- 118. https://invisible-island.net/ncurses/tack.html
- 119. https://github.com/tmux/tmux/wiki
- 120. https://invisible-island.net/vile/
- 121. https://www.gnu.org/software/emacs/
- 122. http://www.greenwoodsoftware.com/less/
- 123. https://www.gnu.org/software/screen/
- 124. https://www.vim.org/
- 125. mailto:dickey@invisible-island.net
- 126. https://invisible-island.net/ncurses/ncurses-license.html
- 127. mailto:bug-ncurses@gnu.org
- 128. mailto:bug-ncurses-request@gnu.org
- 129. ftp://ftp.invisible-island.net/ncurses/
- 130. https://invisible-mirror.net/archives/ncurses/
- 131. http://lists.gnu.org/archive/html/bug-ncurses
- 132. https://lists.gnu.org/archive/html/bug-ncurses
- 133. https://invisible-island.net/ncurses/ncurses-license.html
- 134. https://invisible-island.net/ncurses/ncurses-mapsyms.html
- 135. https://invisible-island.net/ncurses/ncurses-slang.html
- 136. https://invisible-island.net/ncurses/tack.html
- 137. https://invisible-island.net/ncurses/tctest.html
- 138. https://invisible-island.net/ncurses/ncurses.html#download_database
- 139. http://www.catb.org/~esr/terminfo/
- 140. http://web.archive.org/web/*/http://www.cs.utk.edu/~shuford/terminal
- 141. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h2-overview
- 142. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h2-release-notes
- 143. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h3-library
- 144. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h4-new-library
- 145. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h4-fixes-library
- 146. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h3-programs
- 147. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h4-utilities
- 148. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h4-examples
- 149. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h3-database
- 150. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h3-documentation
- 151. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h3-bug-fixes
- 152. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h3-config-config
- 153. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h4-config-major
- 154. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h4-config-options
- 155. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h3-portability
- 156. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h2-features
- 157. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h2-who-uses
- 158. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h2-development
- 159. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h2-this-stuff
- 160. file:///usr/build/ncurses/ncurses-6.1-20180127/doc/html/announce.html#h2-other-stuff
+   covered  in  the  terminfo  file  at  Richard  Shuford's archive . The
+   collection of computer manuals at bitsavers.org has also been useful.
+
+     * Overview
+     * Release Notes
+          + Library improvements
+               o New features
+               o Other improvements
+          + Program improvements
+               o Utilities
+               o Examples
+          + Terminal database
+          + Documentation
+          + Interesting bug-fixes
+          + Configuration changes
+               o Major changes
+               o Configuration options
+          + Portability
+     * Features of ncurses
+     * Applications using ncurses
+     * Development activities
+     * Related resources
+     * Other resources
diff --git a/AUTHORS b/AUTHORS
index 708e1ef735b2..0018842ca099 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,6 @@
 -------------------------------------------------------------------------------
--- Copyright (c) 2006,2017 Free Software Foundation, Inc.                    --
+-- Copyright 2020 Thomas E. Dickey                                           --
+-- Copyright 2006,2017 Free Software Foundation, Inc.                        --
 --                                                                           --
 -- Permission is hereby granted, free of charge, to any person obtaining a   --
 -- copy of this software and associated documentation files (the             --
@@ -25,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: AUTHORS,v 1.3 2017/02/04 15:20:52 tom Exp $
+-- $Id: AUTHORS,v 1.4 2020/02/02 23:34:34 tom Exp $
 -------------------------------------------------------------------------------
 These are the principal authors/contributors of ncurses since 1.9.9e,
 in decreasing order of their contribution:
diff --git a/Ada95/Makefile.in b/Ada95/Makefile.in
index 4d80fe386c1b..67625d7e9cda 100644
--- a/Ada95/Makefile.in
+++ b/Ada95/Makefile.in
@@ -1,6 +1,7 @@
-# $Id: Makefile.in,v 1.22 2015/08/05 23:15:41 tom Exp $
+# $Id: Makefile.in,v 1.23 2020/02/02 23:34:34 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.                #
+# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 1998-2010,2015 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -30,7 +31,7 @@
 #  Author:  Juergen Pfeifer, 1996
 #
 #  Version Control
-#  $Revision: 1.22 $
+#  $Revision: 1.23 $
 #
 SHELL		= @SHELL@
 VPATH		= @srcdir@
diff --git a/Ada95/README b/Ada95/README
index ea9ae80e761d..d014f3278f98 100644
--- a/Ada95/README
+++ b/Ada95/README
@@ -1,5 +1,6 @@
 -------------------------------------------------------------------------------
--- Copyright (c) 1998,2003 Free Software Foundation, Inc.                    --
+-- Copyright 2020 Thomas E. Dickey                                           --
+-- Copyright 1998-2002,2003 Free Software Foundation, Inc.                   --
 --                                                                           --
 -- Permission is hereby granted, free of charge, to any person obtaining a   --
 -- copy of this software and associated documentation files (the             --
diff --git a/Ada95/TODO b/Ada95/TODO
index f5c8acde4c4d..122275f91189 100644
--- a/Ada95/TODO
+++ b/Ada95/TODO
@@ -1,5 +1,6 @@
 -------------------------------------------------------------------------------
--- Copyright (c) 1998-1999,2006 Free Software Foundation, Inc.               --
+-- Copyright 2020 Thomas E. Dickey                                           --
+-- Copyright 1998-1999,2006 Free Software Foundation, Inc.                   --
 --                                                                           --
 -- Permission is hereby granted, free of charge, to any person obtaining a   --
 -- copy of this software and associated documentation files (the             --
@@ -25,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: TODO,v 1.5 2006/04/22 22:23:21 tom Exp $
+-- $Id: TODO,v 1.6 2020/02/02 23:34:34 tom Exp $
 -------------------------------------------------------------------------------
 
 --  Intensive testing
diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 057abc8c4fa7..7438acc170da 100644
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -1,5 +1,6 @@
 dnl***************************************************************************
-dnl Copyright (c) 2010-2019,2020 Free Software Foundation, Inc.              *
+dnl Copyright 2018-2019,2020 Thomas E. Dickey                                *
+dnl Copyright 2010-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl copy of this software and associated documentation files (the            *
@@ -28,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.151 2020/01/11 23:42:04 tom Exp $
+dnl $Id: aclocal.m4,v 1.153 2020/02/08 21:04:00 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -928,6 +929,28 @@ CF_ARG_DISABLE(gnat-projects,
 AC_MSG_RESULT($enable_gnat_projects)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_ENABLE_BROKEN_LINKER version: 1 updated: 2020/02/08 15:59:30
+dnl -----------------------
+dnl Some linkers cannot reference a data-only object.  Cygwin used to be one.
+dnl This usually follows CF_LINK_DATAONLY, but is not required in case we need
+dnl an unconditional feature.
+AC_DEFUN([CF_ENABLE_BROKEN_LINKER],[
+
+AC_MSG_CHECKING(if you want broken-linker support code)
+AC_ARG_ENABLE(broken_linker,
+	[  --enable-broken_linker  compile with broken-linker support code],
+	[with_broken_linker=$enableval],
+	[with_broken_linker=no])
+AC_MSG_RESULT($with_broken_linker)
+
+: ${BROKEN_LINKER:=0}
+if test "x$with_broken_linker" = xyes ; then
+	AC_DEFINE(BROKEN_LINKER,1,[Define to 1 to work around linkers which cannot link data-only modules])
+	BROKEN_LINKER=1
+fi
+AC_SUBST(BROKEN_LINKER)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54
 dnl ---------------
 dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
@@ -2191,7 +2214,7 @@ AC_DEFUN([CF_LIB_TYPE],
 	test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LINK_DATAONLY version: 12 updated: 2017/07/23 17:46:07
+dnl CF_LINK_DATAONLY version: 13 updated: 2020/02/08 15:59:30
 dnl ----------------
 dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
 dnl only data (i.e., no functions), for example NeXT.  On those systems we'll
@@ -2251,6 +2274,7 @@ if test "$cf_cv_link_dataonly" = no ; then
 	AC_DEFINE(BROKEN_LINKER,1,[if data-only library module does not link])
 	BROKEN_LINKER=1
 fi
+AC_SUBST(BROKEN_LINKER)
 
 ])dnl
 dnl ---------------------------------------------------------------------------
diff --git a/Ada95/configure b/Ada95/configure
index 8551030a3c81..03e8fda6fd18 100755
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.74 .
+# From configure.in Revision: 1.76 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20200111.
 #
@@ -10987,7 +10987,8 @@ fi
 ###############################################################################
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
-echo "$as_me:10990: checking if you want broken-linker support code" >&5
+
+echo "$as_me:10991: checking if you want broken-linker support code" >&5
 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
 
 # Check whether --enable-broken_linker or --disable-broken_linker was given.
@@ -10995,44 +10996,31 @@ if test "${enable_broken_linker+set}" = set; then
   enableval="$enable_broken_linker"
   with_broken_linker=$enableval
 else
-  with_broken_linker=${BROKEN_LINKER:-no}
+  with_broken_linker=no
 fi;
-echo "$as_me:11000: result: $with_broken_linker" >&5
+echo "$as_me:11001: result: $with_broken_linker" >&5
 echo "${ECHO_T}$with_broken_linker" >&6
 
-BROKEN_LINKER=0
-if test "$with_broken_linker" = yes ; then
-	cat >>confdefs.h <<\EOF
-#define BROKEN_LINKER 1
-EOF
+: ${BROKEN_LINKER:=0}
+if test "x$with_broken_linker" = xyes ; then
 
-	BROKEN_LINKER=1
-elif test "$DFT_LWR_MODEL" = shared ; then
-	case $cf_cv_system_name in
-	(cygwin*)
-		cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define BROKEN_LINKER 1
 EOF
 
-		BROKEN_LINKER=1
-		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
-
-echo "${as_me:-configure}:11020: testing cygwin linker is broken anyway ..." 1>&5
-
-		;;
-	esac
+	BROKEN_LINKER=1
 fi
 
 # Check to define _XOPEN_SOURCE "automatically"
 
-echo "$as_me:11028: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:11016: checking if the POSIX test-macros are already defined" >&5
 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
 if test "${cf_cv_posix_visible+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11035 "configure"
+#line 11023 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11051,16 +11039,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11054: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11042: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11057: \$? = $ac_status" >&5
+  echo "$as_me:11045: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11063: \$? = $ac_status" >&5
+  echo "$as_me:11051: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_visible=no
 else
@@ -11071,7 +11059,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:11074: result: $cf_cv_posix_visible" >&5
+echo "$as_me:11062: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -11116,14 +11104,14 @@ case $host_os in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:11119: checking if this is the GNU C library" >&5
+echo "$as_me:11107: checking if this is the GNU C library" >&5
 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
 if test "${cf_cv_gnu_library+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11126 "configure"
+#line 11114 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11142,16 +11130,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11145: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11133: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11148: \$? = $ac_status" >&5
+  echo "$as_me:11136: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11154: \$? = $ac_status" >&5
+  echo "$as_me:11142: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -11162,7 +11150,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:11165: result: $cf_cv_gnu_library" >&5
+echo "$as_me:11153: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -11170,7 +11158,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
 	# was changed to help a little.  newlib incorporated the change about 4
 	# years later.
-	echo "$as_me:11173: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:11161: checking if _DEFAULT_SOURCE can be used as a basis" >&5
 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
 if test "${cf_cv_gnu_library_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11182,7 +11170,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 11185 "configure"
+#line 11173 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11201,16 +11189,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11204: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11192: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11207: \$? = $ac_status" >&5
+  echo "$as_me:11195: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11213: \$? = $ac_status" >&5
+  echo "$as_me:11201: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -11222,12 +11210,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:11225: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:11213: result: $cf_cv_gnu_library_219" >&5
 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
 
 	if test "x$cf_cv_gnu_library_219" = xyes; then
 		cf_save="$CPPFLAGS"
-		echo "$as_me:11230: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:11218: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11332,7 +11320,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >conftest.$ac_ext <<_ACEOF
-#line 11335 "configure"
+#line 11323 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -11352,16 +11340,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11355: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11343: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11358: \$? = $ac_status" >&5
+  echo "$as_me:11346: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11364: \$? = $ac_status" >&5
+  echo "$as_me:11352: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -11372,7 +11360,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:11375: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:11363: result: $cf_cv_gnu_dftsrc_219" >&5
 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
 	else
@@ -11381,14 +11369,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:11384: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:11372: checking if we must define _GNU_SOURCE" >&5
 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 11391 "configure"
+#line 11379 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11403,16 +11391,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11406: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11394: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11409: \$? = $ac_status" >&5
+  echo "$as_me:11397: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11415: \$? = $ac_status" >&5
+  echo "$as_me:11403: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11519,7 +11507,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >conftest.$ac_ext <<_ACEOF
-#line 11522 "configure"
+#line 11510 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11534,16 +11522,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11525: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11540: \$? = $ac_status" >&5
+  echo "$as_me:11528: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11546: \$? = $ac_status" >&5
+  echo "$as_me:11534: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11558,12 +11546,12 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:11561: result: $cf_cv_gnu_source" >&5
+echo "$as_me:11549: result: $cf_cv_gnu_source" >&5
 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 
 		if test "$cf_cv_gnu_source" = yes
 		then
-		echo "$as_me:11566: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:11554: checking if we should also define _DEFAULT_SOURCE" >&5
 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_default_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11573,7 +11561,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >conftest.$ac_ext <<_ACEOF
-#line 11576 "configure"
+#line 11564 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11588,16 +11576,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11591: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11579: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11594: \$? = $ac_status" >&5
+  echo "$as_me:11582: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11597: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11585: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11600: \$? = $ac_status" >&5
+  echo "$as_me:11588: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_default_source=no
 else
@@ -11608,7 +11596,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:11611: result: $cf_cv_default_source" >&5
+echo "$as_me:11599: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -11645,16 +11633,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:11648: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:11636: checking if we should define _POSIX_C_SOURCE" >&5
 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "${as_me:-configure}:11654: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:11642: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11657 "configure"
+#line 11645 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11669,16 +11657,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11672: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11660: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11675: \$? = $ac_status" >&5
+  echo "$as_me:11663: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11666: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11681: \$? = $ac_status" >&5
+  echo "$as_me:11669: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -11699,7 +11687,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 11702 "configure"
+#line 11690 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11714,16 +11702,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11717: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11705: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11720: \$? = $ac_status" >&5
+  echo "$as_me:11708: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11726: \$? = $ac_status" >&5
+  echo "$as_me:11714: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11734,7 +11722,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me:-configure}:11737: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:11725: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -11742,10 +11730,10 @@ echo "${as_me:-configure}:11737: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:11745: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:11733: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 11748 "configure"
+#line 11736 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11760,16 +11748,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11763: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11751: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11766: \$? = $ac_status" >&5
+  echo "$as_me:11754: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11772: \$? = $ac_status" >&5
+  echo "$as_me:11760: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11785,7 +11773,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:11788: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:11776: result: $cf_cv_posix_c_source" >&5
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then
@@ -11925,14 +11913,14 @@ fi # cf_cv_posix_visible
 	;;
 (*)
 
-echo "$as_me:11928: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11916: checking if we should define _XOPEN_SOURCE" >&5
 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11935 "configure"
+#line 11923 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -11951,16 +11939,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11954: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11942: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11957: \$? = $ac_status" >&5
+  echo "$as_me:11945: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11963: \$? = $ac_status" >&5
+  echo "$as_me:11951: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -11972,7 +11960,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 11975 "configure"
+#line 11963 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -11991,16 +11979,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11994: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11982: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11997: \$? = $ac_status" >&5
+  echo "$as_me:11985: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12003: \$? = $ac_status" >&5
+  echo "$as_me:11991: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12015,7 +12003,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12018: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12006: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12145,16 +12133,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:12148: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:12136: checking if we should define _POSIX_C_SOURCE" >&5
 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "${as_me:-configure}:12154: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:12142: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12157 "configure"
+#line 12145 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12169,16 +12157,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12172: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12160: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12175: \$? = $ac_status" >&5
+  echo "$as_me:12163: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12166: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12181: \$? = $ac_status" >&5
+  echo "$as_me:12169: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -12199,7 +12187,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12202 "configure"
+#line 12190 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12214,16 +12202,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12217: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12205: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12220: \$? = $ac_status" >&5
+  echo "$as_me:12208: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12226: \$? = $ac_status" >&5
+  echo "$as_me:12214: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12234,7 +12222,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me:-configure}:12237: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12225: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -12242,10 +12230,10 @@ echo "${as_me:-configure}:12237: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:12245: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:12233: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 12248 "configure"
+#line 12236 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12260,16 +12248,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12263: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12251: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12266: \$? = $ac_status" >&5
+  echo "$as_me:12254: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12257: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12272: \$? = $ac_status" >&5
+  echo "$as_me:12260: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12285,7 +12273,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12288: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:12276: result: $cf_cv_posix_c_source" >&5
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then
@@ -12479,7 +12467,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:12482: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12470: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -12489,7 +12477,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:12492: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:12480: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -12499,7 +12487,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:12502: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:12490: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -12509,10 +12497,10 @@ fi
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:12512: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:12500: checking if _XOPEN_SOURCE really is set" >&5
 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12515 "configure"
+#line 12503 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12527,16 +12515,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12518: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12533: \$? = $ac_status" >&5
+  echo "$as_me:12521: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12539: \$? = $ac_status" >&5
+  echo "$as_me:12527: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -12545,12 +12533,12 @@ cat conftest.$ac_ext >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:12548: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:12536: result: $cf_XOPEN_SOURCE_set" >&5
 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
 	if test $cf_XOPEN_SOURCE_set = yes
 	then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12553 "configure"
+#line 12541 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -12565,16 +12553,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12568: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12556: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12571: \$? = $ac_status" >&5
+  echo "$as_me:12559: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12577: \$? = $ac_status" >&5
+  echo "$as_me:12565: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -12585,19 +12573,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		if test $cf_XOPEN_SOURCE_set_ok = no
 		then
-			{ echo "$as_me:12588: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:12576: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:12593: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12581: checking if we should define _XOPEN_SOURCE" >&5
 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12600 "configure"
+#line 12588 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -12616,16 +12604,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12619: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12607: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12622: \$? = $ac_status" >&5
+  echo "$as_me:12610: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12628: \$? = $ac_status" >&5
+  echo "$as_me:12616: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12637,7 +12625,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 12640 "configure"
+#line 12628 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -12656,16 +12644,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12659: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12647: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12662: \$? = $ac_status" >&5
+  echo "$as_me:12650: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12668: \$? = $ac_status" >&5
+  echo "$as_me:12656: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12680,7 +12668,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12683: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12671: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12806,7 +12794,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:12809: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:12797: checking for special C compiler options needed for large files" >&5
 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12818,7 +12806,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >conftest.$ac_ext <<_ACEOF
-#line 12821 "configure"
+#line 12809 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -12838,16 +12826,16 @@ main (void)
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12841: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12829: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12844: \$? = $ac_status" >&5
+  echo "$as_me:12832: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12850: \$? = $ac_status" >&5
+  echo "$as_me:12838: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -12857,16 +12845,16 @@ fi
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12860: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12863: \$? = $ac_status" >&5
+  echo "$as_me:12851: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12869: \$? = $ac_status" >&5
+  echo "$as_me:12857: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -12880,13 +12868,13 @@ rm -f conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:12883: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:12871: result: $ac_cv_sys_largefile_CC" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  echo "$as_me:12889: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:12877: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12894,7 +12882,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 12897 "configure"
+#line 12885 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -12914,16 +12902,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12917: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12905: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12920: \$? = $ac_status" >&5
+  echo "$as_me:12908: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12926: \$? = $ac_status" >&5
+  echo "$as_me:12914: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -12932,7 +12920,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 12935 "configure"
+#line 12923 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -12953,16 +12941,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12956: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12944: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12959: \$? = $ac_status" >&5
+  echo "$as_me:12947: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12965: \$? = $ac_status" >&5
+  echo "$as_me:12953: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -12973,7 +12961,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:12976: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:12964: result: $ac_cv_sys_file_offset_bits" >&5
 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
 if test "$ac_cv_sys_file_offset_bits" != no; then
 
@@ -12983,7 +12971,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:12986: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:12974: checking for _LARGE_FILES value needed for large files" >&5
 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12991,7 +12979,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 12994 "configure"
+#line 12982 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -13011,16 +12999,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13014: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13002: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13017: \$? = $ac_status" >&5
+  echo "$as_me:13005: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13023: \$? = $ac_status" >&5
+  echo "$as_me:13011: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -13029,7 +13017,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 13032 "configure"
+#line 13020 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -13050,16 +13038,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13053: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13041: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13056: \$? = $ac_status" >&5
+  echo "$as_me:13044: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13062: \$? = $ac_status" >&5
+  echo "$as_me:13050: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -13070,7 +13058,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:13073: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:13061: result: $ac_cv_sys_large_files" >&5
 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
 if test "$ac_cv_sys_large_files" != no; then
 
@@ -13083,7 +13071,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:13086: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:13074: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13091,7 +13079,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 13094 "configure"
+#line 13082 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13103,16 +13091,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13106: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13094: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13109: \$? = $ac_status" >&5
+  echo "$as_me:13097: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13115: \$? = $ac_status" >&5
+  echo "$as_me:13103: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -13121,7 +13109,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 13124 "configure"
+#line 13112 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -13134,16 +13122,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13137: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13125: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13140: \$? = $ac_status" >&5
+  echo "$as_me:13128: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13131: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13146: \$? = $ac_status" >&5
+  echo "$as_me:13134: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -13154,7 +13142,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:13157: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:13145: result: $ac_cv_sys_largefile_source" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
 if test "$ac_cv_sys_largefile_source" != no; then
 
@@ -13168,13 +13156,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:13171: checking for fseeko" >&5
+echo "$as_me:13159: checking for fseeko" >&5
 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
 if test "${ac_cv_func_fseeko+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13177 "configure"
+#line 13165 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13186,16 +13174,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13189: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13177: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13192: \$? = $ac_status" >&5
+  echo "$as_me:13180: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13198: \$? = $ac_status" >&5
+  echo "$as_me:13186: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -13205,7 +13193,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13208: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:13196: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -13244,14 +13232,14 @@ fi
 
 	fi
 
-	echo "$as_me:13247: checking whether to use struct dirent64" >&5
+	echo "$as_me:13235: checking whether to use struct dirent64" >&5
 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
 if test "${cf_cv_struct_dirent64+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13254 "configure"
+#line 13242 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -13273,16 +13261,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13276: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13264: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13279: \$? = $ac_status" >&5
+  echo "$as_me:13267: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13285: \$? = $ac_status" >&5
+  echo "$as_me:13273: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -13293,7 +13281,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:13296: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:13284: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -13303,7 +13291,7 @@ EOF
 	fi
 
 ### Enable compiling-in rcs id's
-echo "$as_me:13306: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:13294: checking if RCS identifiers should be compiled-in" >&5
 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
 
 # Check whether --with-rcs-ids or --without-rcs-ids was given.
@@ -13313,7 +13301,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
-echo "$as_me:13316: result: $with_rcs_ids" >&5
+echo "$as_me:13304: result: $with_rcs_ids" >&5
 echo "${ECHO_T}$with_rcs_ids" >&6
 test "$with_rcs_ids" = yes &&
 cat >>confdefs.h <<\EOF
@@ -13323,7 +13311,7 @@ EOF
 ###############################################################################
 
 ### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:13326: checking if you want to build with function extensions" >&5
+echo "$as_me:13314: checking if you want to build with function extensions" >&5
 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
 
 # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
@@ -13333,7 +13321,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
-echo "$as_me:13336: result: $with_ext_funcs" >&5
+echo "$as_me:13324: result: $with_ext_funcs" >&5
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
 	NCURSES_EXT_FUNCS=1
@@ -13351,7 +13339,7 @@ else
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.
-echo "$as_me:13354: checking for extended use of const keyword" >&5
+echo "$as_me:13342: checking for extended use of const keyword" >&5
 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
 
 # Check whether --enable-const or --disable-const was given.
@@ -13361,7 +13349,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=no
 fi;
-echo "$as_me:13364: result: $with_ext_const" >&5
+echo "$as_me:13352: result: $with_ext_const" >&5
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then
@@ -13371,7 +13359,7 @@ fi
 ###############################################################################
 # These options are relatively safe to experiment with.
 
-echo "$as_me:13374: checking if you want all development code" >&5
+echo "$as_me:13362: checking if you want all development code" >&5
 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
 
 # Check whether --with-develop or --without-develop was given.
@@ -13381,7 +13369,7 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
-echo "$as_me:13384: result: $with_develop" >&5
+echo "$as_me:13372: result: $with_develop" >&5
 echo "${ECHO_T}$with_develop" >&6
 
 ###############################################################################
@@ -13390,7 +13378,7 @@ echo "${ECHO_T}$with_develop" >&6
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 
-echo "$as_me:13393: checking if you want to link with the pthread library" >&5
+echo "$as_me:13381: checking if you want to link with the pthread library" >&5
 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
 
 # Check whether --with-pthread or --without-pthread was given.
@@ -13400,27 +13388,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
-echo "$as_me:13403: result: $with_pthread" >&5
+echo "$as_me:13391: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 
 if test "$with_pthread" != no ; then
-	echo "$as_me:13407: checking for pthread.h" >&5
+	echo "$as_me:13395: checking for pthread.h" >&5
 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
 if test "${ac_cv_header_pthread_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13413 "configure"
+#line 13401 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
-if { (eval echo "$as_me:13417: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13405: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13423: \$? = $ac_status" >&5
+  echo "$as_me:13411: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13439,7 +13427,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:13442: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:13430: result: $ac_cv_header_pthread_h" >&5
 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
 if test $ac_cv_header_pthread_h = yes; then
 
@@ -13449,7 +13437,7 @@ EOF
 
 	for cf_lib_pthread in pthread c_r
 	do
-	    echo "$as_me:13452: checking if we can link with the $cf_lib_pthread library" >&5
+	    echo "$as_me:13440: checking if we can link with the $cf_lib_pthread library" >&5
 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
 	    cf_save_LIBS="$LIBS"
 
@@ -13470,7 +13458,7 @@ done
 LIBS="$cf_add_libs"
 
 	    cat >conftest.$ac_ext <<_ACEOF
-#line 13473 "configure"
+#line 13461 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -13487,16 +13475,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13490: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13478: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13493: \$? = $ac_status" >&5
+  echo "$as_me:13481: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13496: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13484: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13499: \$? = $ac_status" >&5
+  echo "$as_me:13487: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   with_pthread=yes
 else
@@ -13506,7 +13494,7 @@ with_pthread=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	    LIBS="$cf_save_LIBS"
-	    echo "$as_me:13509: result: $with_pthread" >&5
+	    echo "$as_me:13497: result: $with_pthread" >&5
 echo "${ECHO_T}$with_pthread" >&6
 	    test "$with_pthread" = yes && break
 	done
@@ -13534,7 +13522,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	else
-	    { { echo "$as_me:13537: error: Cannot link with pthread library" >&5
+	    { { echo "$as_me:13525: error: Cannot link with pthread library" >&5
 echo "$as_me: error: Cannot link with pthread library" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -13543,7 +13531,7 @@ fi
 
 fi
 
-echo "$as_me:13546: checking if you want to use weak-symbols for pthreads" >&5
+echo "$as_me:13534: checking if you want to use weak-symbols for pthreads" >&5
 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
 
 # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
@@ -13553,18 +13541,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
-echo "$as_me:13556: result: $use_weak_symbols" >&5
+echo "$as_me:13544: result: $use_weak_symbols" >&5
 echo "${ECHO_T}$use_weak_symbols" >&6
 if test "$use_weak_symbols" = yes ; then
 
-echo "$as_me:13560: checking if $CC supports weak symbols" >&5
+echo "$as_me:13548: checking if $CC supports weak symbols" >&5
 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
 if test "${cf_cv_weak_symbols+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13567 "configure"
+#line 13555 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13590,16 +13578,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13593: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13581: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13596: \$? = $ac_status" >&5
+  echo "$as_me:13584: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13602: \$? = $ac_status" >&5
+  echo "$as_me:13590: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_weak_symbols=yes
 else
@@ -13610,7 +13598,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:13613: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:13601: result: $cf_cv_weak_symbols" >&5
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
 else
@@ -13639,13 +13627,13 @@ EOF
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.
-echo "$as_me:13642: checking for _nc_TABSIZE" >&5
+echo "$as_me:13630: checking for _nc_TABSIZE" >&5
 echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6
 if test "${ac_cv_func__nc_TABSIZE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13648 "configure"
+#line 13636 "configure"
 #include "confdefs.h"
 #define _nc_TABSIZE autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13676,16 +13664,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13679: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13667: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13682: \$? = $ac_status" >&5
+  echo "$as_me:13670: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13673: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13688: \$? = $ac_status" >&5
+  echo "$as_me:13676: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func__nc_TABSIZE=yes
 else
@@ -13695,7 +13683,7 @@ ac_cv_func__nc_TABSIZE=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13698: result: $ac_cv_func__nc_TABSIZE" >&5
+echo "$as_me:13686: result: $ac_cv_func__nc_TABSIZE" >&5
 echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6
 if test $ac_cv_func__nc_TABSIZE = yes; then
   assume_reentrant=yes
@@ -13707,7 +13695,7 @@ fi
 # opaque outside of that, so there is no --enable-opaque option.  We can use
 # this option without --with-pthreads, but this will be always set for
 # pthreads.
-echo "$as_me:13710: checking if you want experimental reentrant code" >&5
+echo "$as_me:13698: checking if you want experimental reentrant code" >&5
 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
 
 # Check whether --enable-reentrant or --disable-reentrant was given.
@@ -13717,7 +13705,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=$assume_reentrant
 fi;
-echo "$as_me:13720: result: $with_reentrant" >&5
+echo "$as_me:13708: result: $with_reentrant" >&5
 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
 	cf_cv_enable_reentrant=1
@@ -13740,7 +13728,7 @@ fi
 
 ### Allow using a different wrap-prefix
 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-	echo "$as_me:13743: checking for prefix used to wrap public variables" >&5
+	echo "$as_me:13731: checking for prefix used to wrap public variables" >&5
 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
 
 # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
@@ -13750,7 +13738,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
-	echo "$as_me:13753: result: $NCURSES_WRAP_PREFIX" >&5
+	echo "$as_me:13741: result: $NCURSES_WRAP_PREFIX" >&5
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 else
 	NCURSES_WRAP_PREFIX=_nc_
@@ -13764,7 +13752,7 @@ EOF
 
 ###	use option --disable-echo to suppress full display compiling commands
 
-echo "$as_me:13767: checking if you want to see long compiling messages" >&5
+echo "$as_me:13755: checking if you want to see long compiling messages" >&5
 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.
@@ -13798,11 +13786,11 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:13801: result: $enableval" >&5
+echo "$as_me:13789: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 ###	use option --enable-warnings to turn on all gcc warnings
-echo "$as_me:13805: checking if you want to see compiler warnings" >&5
+echo "$as_me:13793: checking if you want to see compiler warnings" >&5
 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.
@@ -13810,7 +13798,7 @@ if test "${enable_warnings+set}" = set; then
   enableval="$enable_warnings"
   with_warnings=$enableval
 fi;
-echo "$as_me:13813: result: $with_warnings" >&5
+echo "$as_me:13801: result: $with_warnings" >&5
 echo "${ECHO_T}$with_warnings" >&6
 
 if test "x$with_warnings" = "xyes"; then
@@ -13836,7 +13824,7 @@ do
 done
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13839 "configure"
+#line 13827 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13851,26 +13839,26 @@ String foo = malloc(1)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13854: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13842: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13857: \$? = $ac_status" >&5
+  echo "$as_me:13845: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13863: \$? = $ac_status" >&5
+  echo "$as_me:13851: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-echo "$as_me:13866: checking for X11/Xt const-feature" >&5
+echo "$as_me:13854: checking for X11/Xt const-feature" >&5
 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13873 "configure"
+#line 13861 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -13887,16 +13875,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13890: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13878: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13893: \$? = $ac_status" >&5
+  echo "$as_me:13881: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13899: \$? = $ac_status" >&5
+  echo "$as_me:13887: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			cf_cv_const_x_string=no
@@ -13911,7 +13899,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:13914: result: $cf_cv_const_x_string" >&5
+echo "$as_me:13902: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -13940,7 +13928,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 cat > conftest.$ac_ext <<EOF
-#line 13943 "${as_me:-configure}"
+#line 13931 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -13956,7 +13944,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:13959: checking for $CC warning options..." >&5
+	{ echo "$as_me:13947: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-Wall"
@@ -13972,12 +13960,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:13975: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:13963: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13978: \$? = $ac_status" >&5
+  echo "$as_me:13966: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:13980: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:13968: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -13985,7 +13973,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:13988: checking for $CC warning options..." >&5
+	{ echo "$as_me:13976: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS=
@@ -14009,12 +13997,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:14012: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:14000: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14015: \$? = $ac_status" >&5
+  echo "$as_me:14003: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:14017: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:14005: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in
 			(Winline)
@@ -14022,7 +14010,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:14025: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:14013: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -14032,7 +14020,7 @@ echo "${as_me:-configure}:14025: testing feature is broken in gcc $GCC_VERSION .
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:14035: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:14023: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -14065,10 +14053,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:14068: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:14056: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 14071 "${as_me:-configure}"
+#line 14059 "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -14117,12 +14105,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:14120: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:14108: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14123: \$? = $ac_status" >&5
+  echo "$as_me:14111: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:14125: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:14113: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case $cf_attribute in
@@ -14182,7 +14170,7 @@ rm -rf conftest*
 fi
 
 ###	use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:14185: checking if you want to enable runtime assertions" >&5
+echo "$as_me:14173: checking if you want to enable runtime assertions" >&5
 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
 
 # Check whether --enable-assertions or --disable-assertions was given.
@@ -14192,7 +14180,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
-echo "$as_me:14195: result: $with_assertions" >&5
+echo "$as_me:14183: result: $with_assertions" >&5
 echo "${ECHO_T}$with_assertions" >&6
 if test -n "$GCC"
 then
@@ -14245,7 +14233,7 @@ case "$CFLAGS $CPPFLAGS" in
 	;;
 esac
 
-echo "$as_me:14248: checking whether to add trace feature to all models" >&5
+echo "$as_me:14236: checking whether to add trace feature to all models" >&5
 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
 
 # Check whether --with-trace or --without-trace was given.
@@ -14255,7 +14243,7 @@ if test "${with_trace+set}" = set; then
 else
   cf_with_trace=$cf_all_traces
 fi;
-echo "$as_me:14258: result: $cf_with_trace" >&5
+echo "$as_me:14246: result: $cf_with_trace" >&5
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "$cf_with_trace" = yes ; then
@@ -14363,7 +14351,7 @@ else
 	ADA_TRACE=FALSE
 fi
 
-echo "$as_me:14366: checking if we want to use GNAT projects" >&5
+echo "$as_me:14354: checking if we want to use GNAT projects" >&5
 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
 
 # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
@@ -14380,7 +14368,7 @@ else
 	enable_gnat_projects=yes
 
 fi;
-echo "$as_me:14383: result: $enable_gnat_projects" >&5
+echo "$as_me:14371: result: $enable_gnat_projects" >&5
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###	Checks for libraries.
@@ -14388,13 +14376,13 @@ case $cf_cv_system_name in
 (*mingw32*)
 	;;
 (*)
-echo "$as_me:14391: checking for gettimeofday" >&5
+echo "$as_me:14379: checking for gettimeofday" >&5
 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
 if test "${ac_cv_func_gettimeofday+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14397 "configure"
+#line 14385 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -14425,16 +14413,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14428: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14416: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14431: \$? = $ac_status" >&5
+  echo "$as_me:14419: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14434: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14437: \$? = $ac_status" >&5
+  echo "$as_me:14425: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -14444,7 +14432,7 @@ ac_cv_func_gettimeofday=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14447: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:14435: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test $ac_cv_func_gettimeofday = yes; then
   cat >>confdefs.h <<\EOF
@@ -14453,7 +14441,7 @@ EOF
 
 else
 
-echo "$as_me:14456: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:14444: checking for gettimeofday in -lbsd" >&5
 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14461,7 +14449,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14464 "configure"
+#line 14452 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14480,16 +14468,16 @@ gettimeofday ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14471: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14486: \$? = $ac_status" >&5
+  echo "$as_me:14474: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14492: \$? = $ac_status" >&5
+  echo "$as_me:14480: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -14500,7 +14488,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14503: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:14491: result: $ac_cv_lib_bsd_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
 if test $ac_cv_lib_bsd_gettimeofday = yes; then
 
@@ -14516,13 +14504,13 @@ fi
 esac
 
 ###	Checks for header files.
-echo "$as_me:14519: checking for ANSI C header files" >&5
+echo "$as_me:14507: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14525 "configure"
+#line 14513 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -14530,13 +14518,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:14533: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14521: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:14539: \$? = $ac_status" >&5
+  echo "$as_me:14527: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14558,7 +14546,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 14561 "configure"
+#line 14549 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -14576,7 +14564,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 14579 "configure"
+#line 14567 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -14597,7 +14585,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14600 "configure"
+#line 14588 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -14623,15 +14611,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14614: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14629: \$? = $ac_status" >&5
+  echo "$as_me:14617: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14634: \$? = $ac_status" >&5
+  echo "$as_me:14622: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14644,7 +14632,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:14647: result: $ac_cv_header_stdc" >&5
+echo "$as_me:14635: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -14660,28 +14648,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14663: checking for $ac_header" >&5
+echo "$as_me:14651: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14669 "configure"
+#line 14657 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14675: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14678: \$? = $ac_status" >&5
+  echo "$as_me:14666: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14684: \$? = $ac_status" >&5
+  echo "$as_me:14672: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -14691,7 +14679,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14694: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14682: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -14701,13 +14689,13 @@ EOF
 fi
 done
 
-echo "$as_me:14704: checking for signed char" >&5
+echo "$as_me:14692: checking for signed char" >&5
 echo $ECHO_N "checking for signed char... $ECHO_C" >&6
 if test "${ac_cv_type_signed_char+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14710 "configure"
+#line 14698 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14722,16 +14710,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14725: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14713: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14728: \$? = $ac_status" >&5
+  echo "$as_me:14716: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14734: \$? = $ac_status" >&5
+  echo "$as_me:14722: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -14741,10 +14729,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14744: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:14732: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:14747: checking size of signed char" >&5
+echo "$as_me:14735: checking size of signed char" >&5
 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
 if test "${ac_cv_sizeof_signed_char+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14753,7 +14741,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 14756 "configure"
+#line 14744 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14765,21 +14753,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14768: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14756: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14771: \$? = $ac_status" >&5
+  echo "$as_me:14759: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14777: \$? = $ac_status" >&5
+  echo "$as_me:14765: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 14782 "configure"
+#line 14770 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14791,16 +14779,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14794: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14782: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14797: \$? = $ac_status" >&5
+  echo "$as_me:14785: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14803: \$? = $ac_status" >&5
+  echo "$as_me:14791: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -14816,7 +14804,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 14819 "configure"
+#line 14807 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14828,16 +14816,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14831: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14819: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14834: \$? = $ac_status" >&5
+  echo "$as_me:14822: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14837: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14840: \$? = $ac_status" >&5
+  echo "$as_me:14828: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -14853,7 +14841,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 14856 "configure"
+#line 14844 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14865,16 +14853,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14868: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14856: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14871: \$? = $ac_status" >&5
+  echo "$as_me:14859: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14877: \$? = $ac_status" >&5
+  echo "$as_me:14865: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -14887,12 +14875,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:14890: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14878: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14895 "configure"
+#line 14883 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14908,15 +14896,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14911: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14899: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14914: \$? = $ac_status" >&5
+  echo "$as_me:14902: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14904: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14919: \$? = $ac_status" >&5
+  echo "$as_me:14907: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -14932,19 +14920,19 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:14935: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:14923: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
 EOF
 
-echo "$as_me:14941: checking for ANSI C header files" >&5
+echo "$as_me:14929: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14947 "configure"
+#line 14935 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -14952,13 +14940,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:14955: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14943: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:14961: \$? = $ac_status" >&5
+  echo "$as_me:14949: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14980,7 +14968,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 14983 "configure"
+#line 14971 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -14998,7 +14986,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 15001 "configure"
+#line 14989 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -15019,7 +15007,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15022 "configure"
+#line 15010 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -15045,15 +15033,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15048: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15036: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15051: \$? = $ac_status" >&5
+  echo "$as_me:15039: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15056: \$? = $ac_status" >&5
+  echo "$as_me:15044: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15066,7 +15054,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:15069: result: $ac_cv_header_stdc" >&5
+echo "$as_me:15057: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -15079,13 +15067,13 @@ fi
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:15082: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:15070: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15088 "configure"
+#line 15076 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -15100,16 +15088,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15103: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15091: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15106: \$? = $ac_status" >&5
+  echo "$as_me:15094: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15112: \$? = $ac_status" >&5
+  echo "$as_me:15100: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -15119,7 +15107,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:15122: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15110: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -15132,7 +15120,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:15135: checking for opendir in -ldir" >&5
+  echo "$as_me:15123: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15140,7 +15128,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15143 "configure"
+#line 15131 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15159,16 +15147,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15162: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15150: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15165: \$? = $ac_status" >&5
+  echo "$as_me:15153: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15171: \$? = $ac_status" >&5
+  echo "$as_me:15159: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -15179,14 +15167,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15182: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:15170: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:15189: checking for opendir in -lx" >&5
+  echo "$as_me:15177: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15194,7 +15182,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15197 "configure"
+#line 15185 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15213,16 +15201,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15204: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15219: \$? = $ac_status" >&5
+  echo "$as_me:15207: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15225: \$? = $ac_status" >&5
+  echo "$as_me:15213: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -15233,7 +15221,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15236: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:15224: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -15241,13 +15229,13 @@ fi
 
 fi
 
-echo "$as_me:15244: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:15232: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15250 "configure"
+#line 15238 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -15263,16 +15251,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15266: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15254: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15269: \$? = $ac_status" >&5
+  echo "$as_me:15257: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15275: \$? = $ac_status" >&5
+  echo "$as_me:15263: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -15282,7 +15270,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:15285: result: $ac_cv_header_time" >&5
+echo "$as_me:15273: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -15300,13 +15288,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 
-echo "$as_me:15303: checking for an ANSI C-conforming const" >&5
+echo "$as_me:15291: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15309 "configure"
+#line 15297 "configure"
 #include "confdefs.h"
 
 int
@@ -15364,16 +15352,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15367: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15355: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15370: \$? = $ac_status" >&5
+  echo "$as_me:15358: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15376: \$? = $ac_status" >&5
+  echo "$as_me:15364: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -15383,7 +15371,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:15386: result: $ac_cv_c_const" >&5
+echo "$as_me:15374: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -15395,7 +15383,7 @@ fi
 
 ###	Checks for external-data
 
-echo "$as_me:15398: checking if data-only library module links" >&5
+echo "$as_me:15386: checking if data-only library module links" >&5
 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
 if test "${cf_cv_link_dataonly+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15403,20 +15391,20 @@ else
 
 	rm -f conftest.a
 	cat >conftest.$ac_ext <<EOF
-#line 15406 "configure"
+#line 15394 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-	if { (eval echo "$as_me:15409: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:15397: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15412: \$? = $ac_status" >&5
+  echo "$as_me:15400: \$? = $ac_status" >&5
   (exit $ac_status); } ; then
 		mv conftest.o data.o && \
 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
 	fi
 	rm -f conftest.$ac_ext data.o
 	cat >conftest.$ac_ext <<EOF
-#line 15419 "configure"
+#line 15407 "configure"
 int	testfunc(void)
 {
 #if defined(NeXT)
@@ -15429,10 +15417,10 @@ int	testfunc(void)
 #endif
 }
 EOF
-	if { (eval echo "$as_me:15432: \"$ac_compile\"") >&5
+	if { (eval echo "$as_me:15420: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15435: \$? = $ac_status" >&5
+  echo "$as_me:15423: \$? = $ac_status" >&5
   (exit $ac_status); }; then
 		mv conftest.o func.o && \
 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
@@ -15445,7 +15433,7 @@ EOF
   cf_cv_link_dataonly=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15448 "configure"
+#line 15436 "configure"
 #include "confdefs.h"
 
 	int main(void)
@@ -15456,15 +15444,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15459: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15447: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15462: \$? = $ac_status" >&5
+  echo "$as_me:15450: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15464: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15467: \$? = $ac_status" >&5
+  echo "$as_me:15455: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_link_dataonly=yes
 else
@@ -15479,7 +15467,7 @@ fi
 
 fi
 
-echo "$as_me:15482: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:15470: result: $cf_cv_link_dataonly" >&5
 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
 
 if test "$cf_cv_link_dataonly" = no ; then
@@ -15498,23 +15486,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:15501: checking for $ac_header" >&5
+echo "$as_me:15489: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15507 "configure"
+#line 15495 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15511: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15499: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15517: \$? = $ac_status" >&5
+  echo "$as_me:15505: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15533,7 +15521,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15536: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15524: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -15543,7 +15531,7 @@ EOF
 fi
 done
 
-echo "$as_me:15546: checking for working mkstemp" >&5
+echo "$as_me:15534: checking for working mkstemp" >&5
 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
 if test "${cf_cv_func_mkstemp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15554,7 +15542,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15557 "configure"
+#line 15545 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15595,15 +15583,15 @@ int main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15598: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15586: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15601: \$? = $ac_status" >&5
+  echo "$as_me:15589: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15606: \$? = $ac_status" >&5
+  echo "$as_me:15594: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -15618,16 +15606,16 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:15621: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:15609: result: $cf_cv_func_mkstemp" >&5
 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
 if test "x$cf_cv_func_mkstemp" = xmaybe ; then
-	echo "$as_me:15624: checking for mkstemp" >&5
+	echo "$as_me:15612: checking for mkstemp" >&5
 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
 if test "${ac_cv_func_mkstemp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15630 "configure"
+#line 15618 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15658,16 +15646,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15661: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15649: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15664: \$? = $ac_status" >&5
+  echo "$as_me:15652: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15667: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15670: \$? = $ac_status" >&5
+  echo "$as_me:15658: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -15677,7 +15665,7 @@ ac_cv_func_mkstemp=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15680: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:15668: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -15706,7 +15694,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
 	unset cf_TEMP_gnat
 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
-echo "$as_me:15709: checking for $ac_word" >&5
+echo "$as_me:15697: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15723,7 +15711,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
-   echo "$as_me:15726: found $ac_dir/$ac_word" >&5
+   echo "$as_me:15714: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -15735,10 +15723,10 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
-  echo "$as_me:15738: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:15726: result: $cf_TEMP_gnat" >&5
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
-  echo "$as_me:15741: result: no" >&5
+  echo "$as_me:15729: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -15748,7 +15736,7 @@ fi
 		unset cf_cv_gnat_version
 		unset cf_TEMP_gnat
 
-echo "$as_me:15751: checking for $cf_prog_gnat version" >&5
+echo "$as_me:15739: checking for $cf_prog_gnat version" >&5
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15759,7 +15747,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:15762: result: $cf_cv_gnat_version" >&5
+echo "$as_me:15750: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
@@ -15788,7 +15776,7 @@ else
 			cd conftest.src
 			for cf_gprconfig in Ada C
 			do
-				echo "$as_me:15791: checking for gprconfig name for $cf_gprconfig" >&5
+				echo "$as_me:15779: checking for gprconfig name for $cf_gprconfig" >&5
 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test $cf_gprconfig = C
 				then
@@ -15807,10 +15795,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 				if test -n "$cf_gprconfig_value"
 				then
 					eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value
-					echo "$as_me:15810: result: $cf_gprconfig_value" >&5
+					echo "$as_me:15798: result: $cf_gprconfig_value" >&5
 echo "${ECHO_T}$cf_gprconfig_value" >&6
 				else
-					echo "$as_me:15813: result: missing" >&5
+					echo "$as_me:15801: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 					cf_ada_config="#"
 					break
@@ -15823,7 +15811,7 @@ echo "${ECHO_T}missing" >&6
 	if test "x$cf_ada_config" != "x#"
 	then
 
-echo "$as_me:15826: checking for gnat version" >&5
+echo "$as_me:15814: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15834,7 +15822,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
-echo "$as_me:15837: result: $cf_cv_gnat_version" >&5
+echo "$as_me:15825: result: $cf_cv_gnat_version" >&5
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
@@ -15843,7 +15831,7 @@ case $cf_cv_gnat_version in
 	cf_cv_prog_gnat_correct=yes
 	;;
 (*)
-	{ echo "$as_me:15846: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:15834: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@@ -15851,7 +15839,7 @@ esac
 
 		# Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:15854: checking for $ac_word" >&5
+echo "$as_me:15842: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_M4_exists+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15866,7 +15854,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:15869: found $ac_dir/$ac_word" >&5
+echo "$as_me:15857: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -15875,20 +15863,20 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:15878: result: $M4_exists" >&5
+  echo "$as_me:15866: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:15881: result: no" >&5
+  echo "$as_me:15869: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		if test "$ac_cv_prog_M4_exists" = no; then
 			cf_cv_prog_gnat_correct=no
-			{ echo "$as_me:15887: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+			{ echo "$as_me:15875: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
 		fi
 		if test "$cf_cv_prog_gnat_correct" = yes; then
-			echo "$as_me:15891: checking if GNAT works" >&5
+			echo "$as_me:15879: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 rm -rf conftest* *~conftest*
@@ -15916,7 +15904,7 @@ else
 fi
 rm -rf conftest* *~conftest*
 
-			echo "$as_me:15919: result: $cf_cv_prog_gnat_correct" >&5
+			echo "$as_me:15907: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
 		fi
 	else
@@ -15926,7 +15914,7 @@ fi
 
 	if test	"$cf_cv_prog_gnat_correct" = yes; then
 
-	echo "$as_me:15929: checking optimization options for ADAFLAGS" >&5
+	echo "$as_me:15917: checking optimization options for ADAFLAGS" >&5
 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 	case "$CFLAGS" in
 	(*-g*)
@@ -15943,10 +15931,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
 		;;
 	esac
-	echo "$as_me:15946: result: $ADAFLAGS" >&5
+	echo "$as_me:15934: result: $ADAFLAGS" >&5
 echo "${ECHO_T}$ADAFLAGS" >&6
 
-echo "$as_me:15949: checking if GNATPREP supports -T option" >&5
+echo "$as_me:15937: checking if GNATPREP supports -T option" >&5
 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
 if test "${cf_cv_gnatprep_opt_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15956,11 +15944,11 @@ cf_cv_gnatprep_opt_t=no
 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
 
 fi
-echo "$as_me:15959: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:15947: result: $cf_cv_gnatprep_opt_t" >&5
 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
 
-echo "$as_me:15963: checking if GNAT supports generics" >&5
+echo "$as_me:15951: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case $cf_cv_gnat_version in
 (3.[1-9]*|[4-9].*)
@@ -15970,7 +15958,7 @@ case $cf_cv_gnat_version in
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:15973: result: $cf_gnat_generics" >&5
+echo "$as_me:15961: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6
 
 if test "$cf_gnat_generics" = yes
@@ -15982,7 +15970,7 @@ else
 	cf_generic_objects=
 fi
 
-echo "$as_me:15985: checking if GNAT supports SIGINT" >&5
+echo "$as_me:15973: checking if GNAT supports SIGINT" >&5
 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
 if test "${cf_cv_gnat_sigint+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16030,7 +16018,7 @@ fi
 rm -rf conftest* *~conftest*
 
 fi
-echo "$as_me:16033: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:16021: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 if test $cf_cv_gnat_sigint = yes ; then
@@ -16043,7 +16031,7 @@ cf_gnat_libraries=no
 cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
-echo "$as_me:16046: checking if GNAT supports project files" >&5
+echo "$as_me:16034: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case $cf_cv_gnat_version in
 (3.[0-9]*)
@@ -16106,15 +16094,15 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:16109: result: $cf_gnat_projects" >&5
+echo "$as_me:16097: result: $cf_gnat_projects" >&5
 echo "${ECHO_T}$cf_gnat_projects" >&6
 fi # enable_gnat_projects
 
 if test $cf_gnat_projects = yes
 then
-	echo "$as_me:16115: checking if GNAT supports libraries" >&5
+	echo "$as_me:16103: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:16117: result: $cf_gnat_libraries" >&5
+	echo "$as_me:16105: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
@@ -16134,7 +16122,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi
 
-echo "$as_me:16137: checking for ada-compiler" >&5
+echo "$as_me:16125: checking for ada-compiler" >&5
 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
 
 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@@ -16145,12 +16133,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
-echo "$as_me:16148: result: $cf_ada_compiler" >&5
+echo "$as_me:16136: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6
 
 		cf_ada_package=terminal_interface
 
-echo "$as_me:16153: checking for ada-include" >&5
+echo "$as_me:16141: checking for ada-include" >&5
 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
 
 # Check whether --with-ada-include or --without-ada-include was given.
@@ -16186,7 +16174,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:16189: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:16177: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -16195,10 +16183,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
-echo "$as_me:16198: result: $ADA_INCLUDE" >&5
+echo "$as_me:16186: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
-echo "$as_me:16201: checking for ada-objects" >&5
+echo "$as_me:16189: checking for ada-objects" >&5
 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
 
 # Check whether --with-ada-objects or --without-ada-objects was given.
@@ -16234,7 +16222,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:16237: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:16225: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -16243,10 +16231,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
-echo "$as_me:16246: result: $ADA_OBJECTS" >&5
+echo "$as_me:16234: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
-echo "$as_me:16249: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:16237: checking if an Ada95 shared-library should be built" >&5
 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
 
 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@@ -16256,14 +16244,14 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
-echo "$as_me:16259: result: $with_ada_sharedlib" >&5
+echo "$as_me:16247: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 if test "x$with_ada_sharedlib" != xno
 then
 	if test "x$cf_gnat_projects" != xyes
 	then
-		{ echo "$as_me:16266: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+		{ echo "$as_me:16254: WARNING: disabling shared-library since GNAT projects are not supported" >&5
 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
 		with_ada_sharedlib=no
 	fi
@@ -16283,7 +16271,7 @@ fi
 
 		# allow the Ada binding to be renamed
 
-echo "$as_me:16286: checking for ada-libname" >&5
+echo "$as_me:16274: checking for ada-libname" >&5
 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
@@ -16299,16 +16287,16 @@ case "x$ADA_LIBNAME" in
 	;;
 esac
 
-echo "$as_me:16302: result: $ADA_LIBNAME" >&5
+echo "$as_me:16290: result: $ADA_LIBNAME" >&5
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
 	else
-		{ { echo "$as_me:16306: error: No usable Ada compiler found" >&5
+		{ { echo "$as_me:16294: error: No usable Ada compiler found" >&5
 echo "$as_me: error: No usable Ada compiler found" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 else
-	{ { echo "$as_me:16311: error: The Ada compiler is needed for this package" >&5
+	{ { echo "$as_me:16299: error: The Ada compiler is needed for this package" >&5
 echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -16348,7 +16336,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
-echo "$as_me:16351: checking default library suffix" >&5
+echo "$as_me:16339: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -16359,10 +16347,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	(shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:16362: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:16350: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
-echo "$as_me:16365: checking default library-dependency suffix" >&5
+echo "$as_me:16353: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 
 	case X$DFT_LWR_MODEL in
@@ -16420,10 +16408,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
 	fi
-echo "$as_me:16423: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:16411: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
-echo "$as_me:16426: checking default object directory" >&5
+echo "$as_me:16414: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 
 	case $DFT_LWR_MODEL in
@@ -16439,7 +16427,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:16442: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:16430: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.
@@ -16681,7 +16669,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:16684: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:16672: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -16857,7 +16845,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:16860: error: ambiguous option: $1
+    { { echo "$as_me:16848: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -16876,7 +16864,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:16879: error: unrecognized option: $1
+  -*) { { echo "$as_me:16867: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -16948,7 +16936,7 @@ do
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
-  *) { { echo "$as_me:16951: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:16939: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -17300,7 +17288,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:17303: creating $ac_file" >&5
+    { echo "$as_me:17291: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -17318,7 +17306,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:17321: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:17309: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -17331,7 +17319,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:17334: error: cannot find input file: $f" >&5
+           { { echo "$as_me:17322: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -17347,7 +17335,7 @@ cat >>$CONFIG_STATUS <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' $ac_item`
         if test -z "$ac_used"; then
-          { echo "$as_me:17350: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:17338: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
@@ -17356,7 +17344,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' $ac_item`
       if test -n "$ac_seen"; then
-        { echo "$as_me:17359: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:17347: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}
@@ -17393,7 +17381,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
-              { echo "$as_me:17396: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:17384: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
@@ -17404,7 +17392,7 @@ $ac_seen" >&2;}
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
-      { echo "$as_me:17407: WARNING: Some variables may not be substituted:
+      { echo "$as_me:17395: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -17453,7 +17441,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:17456: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:17444: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -17464,7 +17452,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:17467: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:17455: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -17477,7 +17465,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:17480: error: cannot find input file: $f" >&5
+           { { echo "$as_me:17468: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -17535,7 +17523,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:17538: $ac_file is unchanged" >&5
+      { echo "$as_me:17526: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/Ada95/configure.in b/Ada95/configure.in
index 21624e1521cf..3c3c1b156155 100644
--- a/Ada95/configure.in
+++ b/Ada95/configure.in
@@ -1,5 +1,6 @@
 dnl***************************************************************************
-dnl Copyright (c) 2010-2019,2020 Free Software Foundation, Inc.              *
+dnl Copyright 2018-2019,2020 Thomas E. Dickey                                *
+dnl Copyright 2010-2016,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl copy of this software and associated documentation files (the            *
@@ -28,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: configure.in,v 1.74 2020/01/11 23:33:38 tom Exp $
+dnl $Id: configure.in,v 1.76 2020/02/08 21:03:20 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -37,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20200111)
-AC_REVISION($Revision: 1.74 $)
+AC_REVISION($Revision: 1.76 $)
 AC_INIT(gen/gen.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -214,27 +215,7 @@ fi
 CF_HELP_MESSAGE(Fine-Tuning Your Configuration:)
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
-AC_MSG_CHECKING(if you want broken-linker support code)
-AC_ARG_ENABLE(broken_linker,
-	[  --enable-broken_linker  compile with broken-linker support code],
-	[with_broken_linker=$enableval],
-	[with_broken_linker=${BROKEN_LINKER:-no}])
-AC_MSG_RESULT($with_broken_linker)
-
-BROKEN_LINKER=0
-if test "$with_broken_linker" = yes ; then
-	AC_DEFINE(BROKEN_LINKER)
-	BROKEN_LINKER=1
-elif test "$DFT_LWR_MODEL" = shared ; then
-	case $cf_cv_system_name in
-	(cygwin*)
-		AC_DEFINE(BROKEN_LINKER)
-		BROKEN_LINKER=1
-		CF_VERBOSE(cygwin linker is broken anyway)
-		;;
-	esac
-fi
-AC_SUBST(BROKEN_LINKER)
+CF_ENABLE_BROKEN_LINKER
 
 # Check to define _XOPEN_SOURCE "automatically"
 CF_XOPEN_SOURCE(600)
@@ -457,7 +438,7 @@ AC_CHECK_LIB(bsd, gettimeofday,
 esac
 
 ###	Checks for header files.
-AC_CHECK_SIZEOF([signed char], 0)
+AC_CHECK_SIZEOF([signed char])
 AC_STDC_HEADERS
 AC_HEADER_DIRENT
 AC_HEADER_TIME
diff --git a/Ada95/doc/Makefile.in b/Ada95/doc/Makefile.in
index c9d6da6becfb..3ef39000e7ba 100644
--- a/Ada95/doc/Makefile.in
+++ b/Ada95/doc/Makefile.in
@@ -1,6 +1,7 @@
-# $Id: Makefile.in,v 1.6 2019/09/07 20:21:52 tom Exp $
+# $Id: Makefile.in,v 1.7 2020/02/02 23:34:34 tom Exp $
 ##############################################################################
-# Copyright (c) 2011-2018,2019 Free Software Foundation, Inc.                #
+# Copyright 2019,2020 Thomas E. Dickey                                       #
+# Copyright 2011-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
diff --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in
index 4e649d1c36e0..446f8bdf8e89 100644
--- a/Ada95/gen/Makefile.in
+++ b/Ada95/gen/Makefile.in
@@ -1,5 +1,6 @@
 ##############################################################################
-# Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.                #
+# Copyright 2019,2020 Thomas E. Dickey                                       #
+# Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -28,7 +29,7 @@
 #
 #  Author:  Juergen Pfeifer, 1996
 #
-#  $Id: Makefile.in,v 1.89 2019/08/31 15:44:14 tom Exp $
+#  $Id: Makefile.in,v 1.90 2020/02/02 23:34:34 tom Exp $
 #
 .SUFFIXES:
 
diff --git a/Ada95/gen/adacurses-config.in b/Ada95/gen/adacurses-config.in
index 8805b0933f8c..2b055dc53f11 100644
--- a/Ada95/gen/adacurses-config.in
+++ b/Ada95/gen/adacurses-config.in
@@ -1,7 +1,8 @@
 #! /bin/sh
-# $Id: adacurses-config.in,v 1.13 2019/09/07 20:20:52 tom Exp $
+# $Id: adacurses-config.in,v 1.14 2020/02/02 23:34:34 tom Exp $
 ##############################################################################
-# Copyright (c) 2007-2016,2019 Free Software Foundation, Inc.                #
+# Copyright 2019,2020 Thomas E. Dickey                                       #
+# Copyright 2007-2014,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
diff --git a/Ada95/gen/gen.c b/Ada95/gen/gen.c
index fd759ba45a41..b204236b34c1 100644
--- a/Ada95/gen/gen.c
+++ b/Ada95/gen/gen.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2014,2016 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -32,7 +33,7 @@
 
 /*
     Version Control
-    $Id: gen.c,v 1.70 2016/02/13 22:00:22 tom Exp $
+    $Id: gen.c,v 1.71 2020/02/02 23:34:34 tom Exp $
   --------------------------------------------------------------------------*/
 /*
   This program prints on its standard output the source for the
diff --git a/Ada95/gen/html.m4 b/Ada95/gen/html.m4
index 76058505b3e9..22374f6bca59 100644
--- a/Ada95/gen/html.m4
+++ b/Ada95/gen/html.m4
@@ -1,5 +1,6 @@
 dnl***************************************************************************
-dnl Copyright (c) 2000-2007,2019 Free Software Foundation, Inc.              *
+dnl Copyright 2019,2020 Thomas E. Dickey                                     *
+dnl Copyright 2000-2006,2007 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl copy of this software and associated documentation files (the            *
@@ -26,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: html.m4,v 1.4 2019/03/16 21:49:15 tom Exp $
+dnl $Id: html.m4,v 1.5 2020/02/02 23:34:34 tom Exp $
 define(`ANCHORIDX',`0')dnl
 define(`MANPAGE',`define(`MANPG',$1)dnl
 |=====================================================================
diff --git a/Ada95/gen/normal.m4 b/Ada95/gen/normal.m4
index 95299768314a..513270271cbc 100644
--- a/Ada95/gen/normal.m4
+++ b/Ada95/gen/normal.m4
@@ -1,5 +1,6 @@
 dnl***************************************************************************
-dnl Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
+dnl Copyright 2020 Thomas E. Dickey                                          *
+dnl Copyright 1998,2006 Free Software Foundation, Inc.                       *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl copy of this software and associated documentation files (the            *
@@ -26,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: normal.m4,v 1.2 2006/04/22 23:16:14 tom Exp $
+dnl $Id: normal.m4,v 1.3 2020/02/02 23:34:34 tom Exp $
 define(`MANPAGE',`define(`MANPG',$1)dnl
 |=====================================================================
    --  | Man page MANPG
diff --git a/Ada95/gen/table.m4 b/Ada95/gen/table.m4
index 36b0027b8d1d..7de07d3c00b6 100644
--- a/Ada95/gen/table.m4
+++ b/Ada95/gen/table.m4
@@ -1,5 +1,6 @@
 dnl***************************************************************************
-dnl Copyright (c) 2000,2006 Free Software Foundation, Inc.                   *
+dnl Copyright 2020 Thomas E. Dickey                                          *
+dnl Copyright 2000,2006 Free Software Foundation, Inc.                       *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl copy of this software and associated documentation files (the            *
@@ -26,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: table.m4,v 1.2 2006/04/22 23:16:44 tom Exp $
+dnl $Id: table.m4,v 1.3 2020/02/02 23:34:34 tom Exp $
 define(`ANCHORIDX',`0')dnl
 define(`MANPAGE',`define(`MANPG',$1)')dnl
 divert(-1)dnl
diff --git a/Ada95/gen/terminal_interface-curses-aux.ads.m4 b/Ada95/gen/terminal_interface-curses-aux.ads.m4
index 5e3505020c66..94eaad87ff3b 100644
--- a/Ada95/gen/terminal_interface-curses-aux.ads.m4
+++ b/Ada95/gen/terminal_interface-curses-aux.ads.m4
@@ -10,7 +10,8 @@ include(M4MACRO)dnl
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2014,2018 Free Software Foundation, Inc.              --
+-- Copyright 2018,2020 Thomas E. Dickey                                     --
+-- Copyright 1998-2011,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -38,7 +39,7 @@ include(M4MACRO)dnl
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.24 $
+--  $Revision: 1.25 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with System;
diff --git a/Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4 b/Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4
index 4a179869b140..0f5db6caa096 100644
--- a/Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4
+++ b/Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4
@@ -10,7 +10,8 @@ include(M4MACRO)dnl
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2014,2018 Free Software Foundation, Inc.              --
+-- Copyright 2018,2020 Thomas E. Dickey                                     --
+-- Copyright 1998-2011,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -38,7 +39,7 @@ include(M4MACRO)dnl
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.20 $
+--  $Revision: 1.21 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Interfaces.C;
diff --git a/Ada95/gen/terminal_interface-curses-forms-field_user_data.ads.m4 b/Ada95/gen/terminal_interface-curses-forms-field_user_data.ads.m4
index 9de700bcd058..71334b601ccd 100644
--- a/Ada95/gen/terminal_interface-curses-forms-field_user_data.ads.m4
+++ b/Ada95/gen/terminal_interface-curses-forms-field_user_data.ads.m4
@@ -10,7 +10,8 @@ include(M4MACRO)dnl
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2003,2009 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -38,7 +39,7 @@ include(M4MACRO)dnl
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.16 $
+--  $Revision: 1.17 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 
diff --git a/Ada95/gen/terminal_interface-curses-forms-form_user_data.ads.m4 b/Ada95/gen/terminal_interface-curses-forms-form_user_data.ads.m4
index f7fb1a702f3f..4a989492c1fa 100644
--- a/Ada95/gen/terminal_interface-curses-forms-form_user_data.ads.m4
+++ b/Ada95/gen/terminal_interface-curses-forms-form_user_data.ads.m4
@@ -10,7 +10,8 @@ include(M4MACRO)dnl
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2003,2009 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -38,7 +39,7 @@ include(M4MACRO)dnl
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.15 $
+--  $Revision: 1.16 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 
diff --git a/Ada95/gen/terminal_interface-curses-forms.ads.m4 b/Ada95/gen/terminal_interface-curses-forms.ads.m4
index b269f4c447d7..1293d3734941 100644
--- a/Ada95/gen/terminal_interface-curses-forms.ads.m4
+++ b/Ada95/gen/terminal_interface-curses-forms.ads.m4
@@ -10,7 +10,8 @@ include(M4MACRO)dnl
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2009,2014 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2009,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -38,8 +39,8 @@ include(M4MACRO)dnl
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.33 $
---  $Date: 2014/05/24 21:31:57 $
+--  $Revision: 1.34 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with System;
diff --git a/Ada95/gen/terminal_interface-curses-menus-item_user_data.ads.m4 b/Ada95/gen/terminal_interface-curses-menus-item_user_data.ads.m4
index 4ffa41b5bdef..57dc963c8945 100644
--- a/Ada95/gen/terminal_interface-curses-menus-item_user_data.ads.m4
+++ b/Ada95/gen/terminal_interface-curses-menus-item_user_data.ads.m4
@@ -10,7 +10,8 @@ include(M4MACRO)dnl
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2006,2009 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2006,2009 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -38,8 +39,8 @@ include(M4MACRO)dnl
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.17 $
---  $Date: 2009/12/26 17:31:35 $
+--  $Revision: 1.18 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 
diff --git a/Ada95/gen/terminal_interface-curses-menus-menu_user_data.ads.m4 b/Ada95/gen/terminal_interface-curses-menus-menu_user_data.ads.m4
index 9138ba6c3ab0..af8ae12dbd5e 100644
--- a/Ada95/gen/terminal_interface-curses-menus-menu_user_data.ads.m4
+++ b/Ada95/gen/terminal_interface-curses-menus-menu_user_data.ads.m4
@@ -10,7 +10,8 @@ include(M4MACRO)dnl
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2003,2009 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -38,7 +39,7 @@ include(M4MACRO)dnl
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.15 $
+--  $Revision: 1.16 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 
diff --git a/Ada95/gen/terminal_interface-curses-menus.ads.m4 b/Ada95/gen/terminal_interface-curses-menus.ads.m4
index 0ad9c456dbda..6914c16b7619 100644
--- a/Ada95/gen/terminal_interface-curses-menus.ads.m4
+++ b/Ada95/gen/terminal_interface-curses-menus.ads.m4
@@ -10,7 +10,8 @@ include(M4MACRO)dnl
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2009,2014 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2009,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -38,8 +39,8 @@ include(M4MACRO)dnl
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.31 $
---  $Date: 2014/05/24 21:31:57 $
+--  $Revision: 1.32 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with System;
diff --git a/Ada95/gen/terminal_interface-curses-mouse.ads.m4 b/Ada95/gen/terminal_interface-curses-mouse.ads.m4
index 8d3f8edc7922..6506b4ed102a 100644
--- a/Ada95/gen/terminal_interface-curses-mouse.ads.m4
+++ b/Ada95/gen/terminal_interface-curses-mouse.ads.m4
@@ -10,7 +10,8 @@ include(M4MACRO)dnl
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2014,2015 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -38,8 +39,8 @@ include(M4MACRO)dnl
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.32 $
---  $Date: 2015/05/30 23:19:19 $
+--  $Revision: 1.33 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with System;
diff --git a/Ada95/gen/terminal_interface-curses-panels-user_data.ads.m4 b/Ada95/gen/terminal_interface-curses-panels-user_data.ads.m4
index 03d8114fdff6..4d60e52c8dc7 100644
--- a/Ada95/gen/terminal_interface-curses-panels-user_data.ads.m4
+++ b/Ada95/gen/terminal_interface-curses-panels-user_data.ads.m4
@@ -10,7 +10,8 @@ include(M4MACRO)dnl
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2003,2009 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -38,7 +39,7 @@ include(M4MACRO)dnl
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.15 $
+--  $Revision: 1.16 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 
diff --git a/Ada95/gen/terminal_interface-curses-panels.ads.m4 b/Ada95/gen/terminal_interface-curses-panels.ads.m4
index b0eda4d427d3..1175343ae8c6 100644
--- a/Ada95/gen/terminal_interface-curses-panels.ads.m4
+++ b/Ada95/gen/terminal_interface-curses-panels.ads.m4
@@ -10,7 +10,8 @@ include(M4MACRO)dnl
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2009,2014 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2009,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -38,8 +39,8 @@ include(M4MACRO)dnl
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.22 $
---  $Date: 2014/05/24 21:31:57 $
+--  $Revision: 1.23 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with System;
diff --git a/Ada95/gen/terminal_interface-curses-trace.ads.m4 b/Ada95/gen/terminal_interface-curses-trace.ads.m4
index e22734358a5e..794d132929bd 100644
--- a/Ada95/gen/terminal_interface-curses-trace.ads.m4
+++ b/Ada95/gen/terminal_interface-curses-trace.ads.m4
@@ -9,7 +9,8 @@ include(M4MACRO)----------------------------------------------------------------
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000,2014 Free Software Foundation, Inc.                   --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000,2014 Free Software Foundation, Inc.                       --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -37,7 +38,7 @@ include(M4MACRO)----------------------------------------------------------------
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control:
---  $Revision: 1.4 $
+--  $Revision: 1.5 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 
diff --git a/Ada95/gen/terminal_interface-curses.adb.m4 b/Ada95/gen/terminal_interface-curses.adb.m4
index 1c55ed2589e9..3f34d203d57c 100644
--- a/Ada95/gen/terminal_interface-curses.adb.m4
+++ b/Ada95/gen/terminal_interface-curses.adb.m4
@@ -9,7 +9,8 @@ include(M4MACRO)----------------------------------------------------------------
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2014,2018 Free Software Foundation, Inc.              --
+-- Copyright 2018,2020 Thomas E. Dickey                                     --
+-- Copyright 2007-2011,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -37,8 +38,8 @@ include(M4MACRO)----------------------------------------------------------------
 ------------------------------------------------------------------------------
 --  Author: Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.15 $
---  $Date: 2018/07/07 23:28:45 $
+--  $Revision: 1.16 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with System;
diff --git a/Ada95/gen/terminal_interface-curses.ads.m4 b/Ada95/gen/terminal_interface-curses.ads.m4
index 25bb5d9b5f4c..a5e9103683aa 100644
--- a/Ada95/gen/terminal_interface-curses.ads.m4
+++ b/Ada95/gen/terminal_interface-curses.ads.m4
@@ -9,7 +9,8 @@ include(M4MACRO)----------------------------------------------------------------
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2011,2014 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2011,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -37,8 +38,8 @@ include(M4MACRO)----------------------------------------------------------------
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.47 $
---  $Date: 2014/05/24 21:31:57 $
+--  $Revision: 1.48 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with System.Storage_Elements;
diff --git a/Ada95/include/MKncurses_def.sh b/Ada95/include/MKncurses_def.sh
index 1740bccb8c08..4b2ae4166880 100755
--- a/Ada95/include/MKncurses_def.sh
+++ b/Ada95/include/MKncurses_def.sh
@@ -1,7 +1,8 @@
 #! /bin/sh
-# $Id: MKncurses_def.sh,v 1.3 2003/10/25 16:19:46 tom Exp $
+# $Id: MKncurses_def.sh,v 1.4 2020/02/02 23:34:34 tom Exp $
 ##############################################################################
-# Copyright (c) 2000,2003 Free Software Foundation, Inc.                     #
+# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2003 Free Software Foundation, Inc.                              #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
diff --git a/Ada95/include/Makefile.in b/Ada95/include/Makefile.in
index d497fb184167..58713d17d2bc 100644
--- a/Ada95/include/Makefile.in
+++ b/Ada95/include/Makefile.in
@@ -1,6 +1,7 @@
-# $Id: Makefile.in,v 1.5 2018/01/15 22:12:59 tom Exp $
+# $Id: Makefile.in,v 1.6 2020/02/02 23:34:34 tom Exp $
 ##############################################################################
-# Copyright (c) 2010-2015,2018 Free Software Foundation, Inc.                #
+# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2010-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
diff --git a/Ada95/include/ncurses_cfg.hin b/Ada95/include/ncurses_cfg.hin
index 533a5606218d..f8bcb6628742 100644
--- a/Ada95/include/ncurses_cfg.hin
+++ b/Ada95/include/ncurses_cfg.hin
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2005-2017,2018 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -30,7 +31,7 @@
  *  Author: Thomas E. Dickey <dickey@clark.net> 1997                        *
  ****************************************************************************/
 /*
- * $Id: ncurses_cfg.hin,v 1.10 2018/01/01 15:10:43 tom Exp $
+ * $Id: ncurses_cfg.hin,v 1.11 2020/02/02 23:34:34 tom Exp $
  *
  * This is a template-file used to generate the "ncurses_cfg.h" file.
  *
diff --git a/Ada95/include/ncurses_defs b/Ada95/include/ncurses_defs
index 31746200df5c..7a7059bf7de9 100644
--- a/Ada95/include/ncurses_defs
+++ b/Ada95/include/ncurses_defs
@@ -1,6 +1,7 @@
-# $Id: ncurses_defs,v 1.44 2013/04/27 19:50:17 tom Exp $
+# $Id: ncurses_defs,v 1.45 2020/02/02 23:34:34 tom Exp $
 ##############################################################################
-# Copyright (c) 2000-2012,2013 Free Software Foundation, Inc.                #
+# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2008-2012,2013 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
diff --git a/Ada95/make-tar.sh b/Ada95/make-tar.sh
index fbedca72e238..e88b312841b1 100755
--- a/Ada95/make-tar.sh
+++ b/Ada95/make-tar.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
-# $Id: make-tar.sh,v 1.17 2019/03/02 22:51:42 tom Exp $
+# $Id: make-tar.sh,v 1.18 2020/02/02 23:34:34 tom Exp $
 ##############################################################################
-# Copyright (c) 2010-2017,2019 Free Software Foundation, Inc.                #
+# Copyright 2019,2020 Thomas E. Dickey                                       #
+# Copyright 2010-2015,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
diff --git a/Ada95/mk-1st.awk b/Ada95/mk-1st.awk
index 77265497152a..616bfa6b1cea 100644
--- a/Ada95/mk-1st.awk
+++ b/Ada95/mk-1st.awk
@@ -1,6 +1,7 @@
-# $Id: mk-1st.awk,v 1.4 2011/02/22 09:40:01 tom Exp $
+# $Id: mk-1st.awk,v 1.5 2020/02/02 23:34:34 tom Exp $
 ##############################################################################
-# Copyright (c) 2010,2011 Free Software Foundation, Inc.                     #
+# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2010,2011 Free Software Foundation, Inc.                         #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
diff --git a/Ada95/samples/Makefile.in b/Ada95/samples/Makefile.in
index c7323e8b249e..25568490aab0 100644
--- a/Ada95/samples/Makefile.in
+++ b/Ada95/samples/Makefile.in
@@ -1,5 +1,6 @@
 ##############################################################################
-# Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.                #
+# Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+# Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -28,7 +29,7 @@
 #
 #  Author:  Juergen Pfeifer, 1996
 #
-#  $Id: Makefile.in,v 1.57 2019/12/22 01:09:19 tom Exp $
+#  $Id: Makefile.in,v 1.59 2020/02/02 23:34:34 tom Exp $
 #
 .SUFFIXES:
 
@@ -166,4 +167,4 @@ realclean :: distclean
 
 $(THISLIB)-explanation.adb : $(srcdir)/$(THISLIB)-explanation.adb_p
 	rm -f $@
-	$(ADAPREP) -DTHIS_DATADIR=\"$(THIS_DATADIR)/\" @GNATPREP_OPTS@ $(srcdir)/$(THISLIB)-explanation.adb_p $@
+	$(AWK) -v this_datadir=$(THIS_DATADIR) -f $(srcdir)/split-path.awk < $(srcdir)/$(THISLIB)-explanation.adb_p  >$@
diff --git a/Ada95/samples/README b/Ada95/samples/README
index c4f16ad306dc..8562343304d4 100644
--- a/Ada95/samples/README
+++ b/Ada95/samples/README
@@ -1,5 +1,6 @@
 -------------------------------------------------------------------------------
--- Copyright (c) 1998,2006 Free Software Foundation, Inc.                    --
+-- Copyright 2020 Thomas E. Dickey                                           --
+-- Copyright 1998,2006 Free Software Foundation, Inc.                        --
 --                                                                           --
 -- Permission is hereby granted, free of charge, to any person obtaining a   --
 -- copy of this software and associated documentation files (the             --
@@ -25,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: README,v 1.2 2006/04/22 22:24:12 tom Exp $
+-- $Id: README,v 1.3 2020/02/02 23:34:34 tom Exp $
 -------------------------------------------------------------------------------
 
 The intention of the demo at this point in time is not to demonstrate all
diff --git a/Ada95/samples/ncurses.adb b/Ada95/samples/ncurses.adb
index 19f658d5632c..39ba7dcbd46b 100644
--- a/Ada95/samples/ncurses.adb
+++ b/Ada95/samples/ncurses.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with ncurses2.m; use ncurses2.m;
diff --git a/Ada95/samples/ncurses2-acs_and_scroll.adb b/Ada95/samples/ncurses2-acs_and_scroll.adb
index 0d2a26b0449c..7bb492c5e0d4 100644
--- a/Ada95/samples/ncurses2-acs_and_scroll.adb
+++ b/Ada95/samples/ncurses2-acs_and_scroll.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2011,2018 Free Software Foundation, Inc.              --
+-- Copyright 2018,2020 Thomas E. Dickey                                     --
+-- Copyright 2000-2009,2011 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.12 $
---  $Date: 2018/07/07 23:31:55 $
+--  $Revision: 1.13 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 --  Windows and scrolling tester.
diff --git a/Ada95/samples/ncurses2-acs_and_scroll.ads b/Ada95/samples/ncurses2-acs_and_scroll.ads
index 79e4862af0f6..bd2759a667b7 100644
--- a/Ada95/samples/ncurses2-acs_and_scroll.ads
+++ b/Ada95/samples/ncurses2-acs_and_scroll.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 procedure ncurses2.acs_and_scroll;
diff --git a/Ada95/samples/ncurses2-acs_display.adb b/Ada95/samples/ncurses2-acs_display.adb
index a71c61d5daff..2916e15c71cd 100644
--- a/Ada95/samples/ncurses2-acs_display.adb
+++ b/Ada95/samples/ncurses2-acs_display.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2006,2008 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000-2006,2008 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.6 $
---  $Date: 2008/07/26 18:47:34 $
+--  $Revision: 1.7 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with ncurses2.util; use ncurses2.util;
diff --git a/Ada95/samples/ncurses2-acs_display.ads b/Ada95/samples/ncurses2-acs_display.ads
index 4e616c5e1443..d685e58ac4ba 100644
--- a/Ada95/samples/ncurses2-acs_display.ads
+++ b/Ada95/samples/ncurses2-acs_display.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 procedure ncurses2.acs_display;
diff --git a/Ada95/samples/ncurses2-attr_test.adb b/Ada95/samples/ncurses2-attr_test.adb
index 66271042c0bb..b41cc8081ee4 100644
--- a/Ada95/samples/ncurses2-attr_test.adb
+++ b/Ada95/samples/ncurses2-attr_test.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2007,2008 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000-2007,2008 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.9 $
---  $Date: 2008/07/26 18:47:26 $
+--  $Revision: 1.10 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with ncurses2.util; use ncurses2.util;
diff --git a/Ada95/samples/ncurses2-attr_test.ads b/Ada95/samples/ncurses2-attr_test.ads
index 51c51435eab5..08931eec550d 100644
--- a/Ada95/samples/ncurses2-attr_test.ads
+++ b/Ada95/samples/ncurses2-attr_test.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000,2006 Free Software Foundation, Inc.                   --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000,2006 Free Software Foundation, Inc.                       --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.2 $
---  $Date: 2006/06/25 14:24:40 $
+--  $Revision: 1.3 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 procedure ncurses2.attr_test;
diff --git a/Ada95/samples/ncurses2-color_edit.adb b/Ada95/samples/ncurses2-color_edit.adb
index 098f98d837b2..7c30c666a234 100644
--- a/Ada95/samples/ncurses2-color_edit.adb
+++ b/Ada95/samples/ncurses2-color_edit.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2006,2009 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000-2006,2009 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.6 $
---  $Date: 2009/12/26 17:38:58 $
+--  $Revision: 1.7 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with ncurses2.util; use ncurses2.util;
diff --git a/Ada95/samples/ncurses2-color_edit.ads b/Ada95/samples/ncurses2-color_edit.ads
index 3e8e392dfe8e..a44889b2e12e 100644
--- a/Ada95/samples/ncurses2-color_edit.ads
+++ b/Ada95/samples/ncurses2-color_edit.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 procedure ncurses2.color_edit;
diff --git a/Ada95/samples/ncurses2-color_test.adb b/Ada95/samples/ncurses2-color_test.adb
index c8f6c837ae17..ca35e04a8acf 100644
--- a/Ada95/samples/ncurses2-color_test.adb
+++ b/Ada95/samples/ncurses2-color_test.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2006,2008 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000-2006,2008 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.3 $
---  $Date: 2008/07/26 18:47:17 $
+--  $Revision: 1.4 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with ncurses2.util; use ncurses2.util;
diff --git a/Ada95/samples/ncurses2-color_test.ads b/Ada95/samples/ncurses2-color_test.ads
index 6e663181a9bc..e927fdd699eb 100644
--- a/Ada95/samples/ncurses2-color_test.ads
+++ b/Ada95/samples/ncurses2-color_test.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 procedure ncurses2.color_test;
diff --git a/Ada95/samples/ncurses2-demo_forms.adb b/Ada95/samples/ncurses2-demo_forms.adb
index 0eeeb5e3f862..5c86af793357 100644
--- a/Ada95/samples/ncurses2-demo_forms.adb
+++ b/Ada95/samples/ncurses2-demo_forms.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2011,2014 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000-2011,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.7 $
---  $Date: 2014/09/13 19:10:18 $
+--  $Revision: 1.8 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with ncurses2.util; use ncurses2.util;
diff --git a/Ada95/samples/ncurses2-demo_forms.ads b/Ada95/samples/ncurses2-demo_forms.ads
index eabaa01b9e91..775e77714ef5 100644
--- a/Ada95/samples/ncurses2-demo_forms.ads
+++ b/Ada95/samples/ncurses2-demo_forms.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 procedure ncurses2.demo_forms;
diff --git a/Ada95/samples/ncurses2-demo_pad.adb b/Ada95/samples/ncurses2-demo_pad.adb
index 781e3a003057..86bfb2d689d9 100644
--- a/Ada95/samples/ncurses2-demo_pad.adb
+++ b/Ada95/samples/ncurses2-demo_pad.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2014,2020 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000-2011,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.10 $
---  $Date: 2020/01/18 17:02:13 $
+--  $Revision: 1.11 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with ncurses2.util; use ncurses2.util;
diff --git a/Ada95/samples/ncurses2-demo_pad.ads b/Ada95/samples/ncurses2-demo_pad.ads
index b996263c1cde..f110632d3252 100644
--- a/Ada95/samples/ncurses2-demo_pad.ads
+++ b/Ada95/samples/ncurses2-demo_pad.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 procedure ncurses2.demo_pad;
diff --git a/Ada95/samples/ncurses2-demo_panels.adb b/Ada95/samples/ncurses2-demo_panels.adb
index 5e2320adcdff..aa6ca369f5b2 100644
--- a/Ada95/samples/ncurses2-demo_panels.adb
+++ b/Ada95/samples/ncurses2-demo_panels.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2011,2018 Free Software Foundation, Inc.              --
+-- Copyright 2018,2020 Thomas E. Dickey                                     --
+-- Copyright 2000-2008,2011 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.8 $
---  $Date: 2018/07/07 23:31:02 $
+--  $Revision: 1.9 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with ncurses2.util; use ncurses2.util;
diff --git a/Ada95/samples/ncurses2-demo_panels.ads b/Ada95/samples/ncurses2-demo_panels.ads
index eb2878c8501e..a35842de3c66 100644
--- a/Ada95/samples/ncurses2-demo_panels.ads
+++ b/Ada95/samples/ncurses2-demo_panels.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 procedure ncurses2.demo_panels (nap_mseci : Integer);
diff --git a/Ada95/samples/ncurses2-flushinp_test.adb b/Ada95/samples/ncurses2-flushinp_test.adb
index 9ea98e158c34..eca47339dcd8 100644
--- a/Ada95/samples/ncurses2-flushinp_test.adb
+++ b/Ada95/samples/ncurses2-flushinp_test.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Terminal_Interface.Curses; use Terminal_Interface.Curses;
diff --git a/Ada95/samples/ncurses2-flushinp_test.ads b/Ada95/samples/ncurses2-flushinp_test.ads
index 5376c94a54b2..ca8244e18e9d 100644
--- a/Ada95/samples/ncurses2-flushinp_test.ads
+++ b/Ada95/samples/ncurses2-flushinp_test.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Terminal_Interface.Curses;
diff --git a/Ada95/samples/ncurses2-genericputs.adb b/Ada95/samples/ncurses2-genericputs.adb
index 829d08d23a2f..71d1c1633f41 100644
--- a/Ada95/samples/ncurses2-genericputs.adb
+++ b/Ada95/samples/ncurses2-genericputs.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2008,2009 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000-2008,2009 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.4 $
---  $Date: 2009/12/26 17:38:58 $
+--  $Revision: 1.5 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Terminal_Interface.Curses; use Terminal_Interface.Curses;
diff --git a/Ada95/samples/ncurses2-genericputs.ads b/Ada95/samples/ncurses2-genericputs.ads
index accc3cc63d70..41f2c9b7f303 100644
--- a/Ada95/samples/ncurses2-genericputs.ads
+++ b/Ada95/samples/ncurses2-genericputs.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2006,2009 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000-2006,2009 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.3 $
---  $Date: 2009/12/26 17:38:58 $
+--  $Revision: 1.4 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 
diff --git a/Ada95/samples/ncurses2-getch.ads b/Ada95/samples/ncurses2-getch.ads
index 21a09f3160f2..7fabce9cc097 100644
--- a/Ada95/samples/ncurses2-getch.ads
+++ b/Ada95/samples/ncurses2-getch.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 procedure getch_test;
diff --git a/Ada95/samples/ncurses2-getch_test.adb b/Ada95/samples/ncurses2-getch_test.adb
index 8f020e7c123b..8bcb7a412acf 100644
--- a/Ada95/samples/ncurses2-getch_test.adb
+++ b/Ada95/samples/ncurses2-getch_test.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2009,2014 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000-2009,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.9 $
---  $Date: 2014/09/13 19:10:18 $
+--  $Revision: 1.10 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 --  Character input test
diff --git a/Ada95/samples/ncurses2-getch_test.ads b/Ada95/samples/ncurses2-getch_test.ads
index 78a0a48c172e..01e19283aa24 100644
--- a/Ada95/samples/ncurses2-getch_test.ads
+++ b/Ada95/samples/ncurses2-getch_test.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 procedure ncurses2.getch_test;
diff --git a/Ada95/samples/ncurses2-getopt.adb b/Ada95/samples/ncurses2-getopt.adb
index 29f1fee8281a..7c902f9308ba 100644
--- a/Ada95/samples/ncurses2-getopt.adb
+++ b/Ada95/samples/ncurses2-getopt.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2008,2011 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000-2008,2011 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.8 $
---  $Date: 2011/03/19 12:09:51 $
+--  $Revision: 1.9 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 --  A simplified version of the  GNU getopt function
diff --git a/Ada95/samples/ncurses2-getopt.ads b/Ada95/samples/ncurses2-getopt.ads
index a8b356e968d6..09d997cf816c 100644
--- a/Ada95/samples/ncurses2-getopt.ads
+++ b/Ada95/samples/ncurses2-getopt.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000,2006 Free Software Foundation, Inc.                   --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000,2006 Free Software Foundation, Inc.                       --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.2 $
---  $Date: 2006/06/25 14:24:40 $
+--  $Revision: 1.3 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 package ncurses2.getopt is
diff --git a/Ada95/samples/ncurses2-m.adb b/Ada95/samples/ncurses2-m.adb
index 1e53b3fe04e9..e8a837d8240e 100644
--- a/Ada95/samples/ncurses2-m.adb
+++ b/Ada95/samples/ncurses2-m.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2018,2020 Free Software Foundation, Inc.              --
+-- Copyright 2018,2020 Thomas E. Dickey                                     --
+-- Copyright 2000-2007,2008 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.10 $
---  $Date: 2020/01/18 17:02:13 $
+--  $Revision: 1.11 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 --  TODO use Default_Character where appropriate
diff --git a/Ada95/samples/ncurses2-m.ads b/Ada95/samples/ncurses2-m.ads
index c32d895dc147..3c87da75992a 100644
--- a/Ada95/samples/ncurses2-m.ads
+++ b/Ada95/samples/ncurses2-m.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 package ncurses2.m is
diff --git a/Ada95/samples/ncurses2-menu_test.adb b/Ada95/samples/ncurses2-menu_test.adb
index bce9782372a4..721f7502c6ef 100644
--- a/Ada95/samples/ncurses2-menu_test.adb
+++ b/Ada95/samples/ncurses2-menu_test.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2006,2011 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000-2006,2011 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.8 $
---  $Date: 2011/03/23 00:39:28 $
+--  $Revision: 1.9 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with ncurses2.util; use ncurses2.util;
diff --git a/Ada95/samples/ncurses2-menu_test.ads b/Ada95/samples/ncurses2-menu_test.ads
index 17e5b16b3e48..1b7e74bb7580 100644
--- a/Ada95/samples/ncurses2-menu_test.ads
+++ b/Ada95/samples/ncurses2-menu_test.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 procedure ncurses2.menu_test;
diff --git a/Ada95/samples/ncurses2-overlap_test.adb b/Ada95/samples/ncurses2-overlap_test.adb
index 948b2b38d623..11a2d0be782b 100644
--- a/Ada95/samples/ncurses2-overlap_test.adb
+++ b/Ada95/samples/ncurses2-overlap_test.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2014,2015 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000-2014,2015 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.7 $
---  $Date: 2015/07/25 23:43:19 $
+--  $Revision: 1.8 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with ncurses2.util; use ncurses2.util;
diff --git a/Ada95/samples/ncurses2-overlap_test.ads b/Ada95/samples/ncurses2-overlap_test.ads
index ce6e3e696121..d6589eab3811 100644
--- a/Ada95/samples/ncurses2-overlap_test.ads
+++ b/Ada95/samples/ncurses2-overlap_test.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 procedure ncurses2.overlap_test;
diff --git a/Ada95/samples/ncurses2-slk_test.adb b/Ada95/samples/ncurses2-slk_test.adb
index 755542c31547..4971ed64bb2e 100644
--- a/Ada95/samples/ncurses2-slk_test.adb
+++ b/Ada95/samples/ncurses2-slk_test.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2011,2018 Free Software Foundation, Inc.              --
+-- Copyright 2018,2020 Thomas E. Dickey                                     --
+-- Copyright 2000-2009,2011 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.10 $
---  $Date: 2018/07/07 23:30:32 $
+--  $Revision: 1.11 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with ncurses2.util; use ncurses2.util;
diff --git a/Ada95/samples/ncurses2-slk_test.ads b/Ada95/samples/ncurses2-slk_test.ads
index 51e95871a97c..1aff9d0c93c9 100644
--- a/Ada95/samples/ncurses2-slk_test.ads
+++ b/Ada95/samples/ncurses2-slk_test.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 procedure ncurses2.slk_test;
diff --git a/Ada95/samples/ncurses2-test_sgr_attributes.adb b/Ada95/samples/ncurses2-test_sgr_attributes.adb
index 97449a40cafc..ac6df4a1857b 100644
--- a/Ada95/samples/ncurses2-test_sgr_attributes.adb
+++ b/Ada95/samples/ncurses2-test_sgr_attributes.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000,2006 Free Software Foundation, Inc.                   --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000,2006 Free Software Foundation, Inc.                       --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.2 $
---  $Date: 2006/06/25 14:24:40 $
+--  $Revision: 1.3 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Terminal_Interface.Curses; use Terminal_Interface.Curses;
diff --git a/Ada95/samples/ncurses2-test_sgr_attributes.ads b/Ada95/samples/ncurses2-test_sgr_attributes.ads
index 241118094e16..5589547347d0 100644
--- a/Ada95/samples/ncurses2-test_sgr_attributes.ads
+++ b/Ada95/samples/ncurses2-test_sgr_attributes.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 procedure ncurses2.test_sgr_attributes;
diff --git a/Ada95/samples/ncurses2-trace_set.adb b/Ada95/samples/ncurses2-trace_set.adb
index df4468b23812..d2739809dad4 100644
--- a/Ada95/samples/ncurses2-trace_set.adb
+++ b/Ada95/samples/ncurses2-trace_set.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2011,2014 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000-2011,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.6 $
---  $Date: 2014/09/13 19:10:18 $
+--  $Revision: 1.7 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with ncurses2.util; use ncurses2.util;
diff --git a/Ada95/samples/ncurses2-trace_set.ads b/Ada95/samples/ncurses2-trace_set.ads
index 7bbf8ca5450a..352736c97686 100644
--- a/Ada95/samples/ncurses2-trace_set.ads
+++ b/Ada95/samples/ncurses2-trace_set.ads
@@ -7,7 +7,8 @@
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 procedure ncurses2.trace_set;
diff --git a/Ada95/samples/ncurses2-util.adb b/Ada95/samples/ncurses2-util.adb
index e0f3d35bbca4..152a5d3777af 100644
--- a/Ada95/samples/ncurses2-util.adb
+++ b/Ada95/samples/ncurses2-util.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2008,2014 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000-2008,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.9 $
---  $Date: 2014/05/24 21:32:18 $
+--  $Revision: 1.10 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Ada.Text_IO; use Ada.Text_IO;
diff --git a/Ada95/samples/ncurses2-util.ads b/Ada95/samples/ncurses2-util.ads
index f46749f06862..5d71d73a7b5d 100644
--- a/Ada95/samples/ncurses2-util.ads
+++ b/Ada95/samples/ncurses2-util.ads
@@ -7,7 +7,8 @@
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000,2006 Free Software Foundation, Inc.                   --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000,2006 Free Software Foundation, Inc.                       --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.2 $
---  $Date: 2006/06/25 14:24:40 $
+--  $Revision: 1.3 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Terminal_Interface.Curses; use Terminal_Interface.Curses;
diff --git a/Ada95/samples/ncurses2.ads b/Ada95/samples/ncurses2.ads
index 2fe01970899d..42e66f3008a3 100644
--- a/Ada95/samples/ncurses2.ads
+++ b/Ada95/samples/ncurses2.ads
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000 Free Software Foundation, Inc.                        --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000 Free Software Foundation, Inc.                            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.1 $
+--  $Revision: 1.2 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 
diff --git a/Ada95/samples/rain.adb b/Ada95/samples/rain.adb
index d673018eb036..2649252ad6ce 100644
--- a/Ada95/samples/rain.adb
+++ b/Ada95/samples/rain.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2007,2008 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -36,8 +37,8 @@
 --  Author:  Laurent Pautet <pautet@gnat.com>
 --  Modified by:  Juergen Pfeifer, 1997
 --  Version Control
---  $Revision: 1.8 $
---  $Date: 2008/08/30 21:38:07 $
+--  $Revision: 1.9 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 --                                                                          --
diff --git a/Ada95/samples/rain.ads b/Ada95/samples/rain.ads
index 9c7242e9b3a3..20ec0651e204 100644
--- a/Ada95/samples/rain.ads
+++ b/Ada95/samples/rain.ads
@@ -7,7 +7,8 @@
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998,2003 Free Software Foundation, Inc.                   --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2002,2003 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -36,7 +37,7 @@
 --  Author:  Laurent Pautet <pautet@gnat.com>
 --  Modified by:  Juergen Pfeifer, 1997
 --  Version Control
---  $Revision: 1.7 $
+--  $Revision: 1.8 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 --                                                                          --
diff --git a/Ada95/samples/sample-curses_demo-attributes.adb b/Ada95/samples/sample-curses_demo-attributes.adb
index b0f60d4a3465..ed9371162f26 100644
--- a/Ada95/samples/sample-curses_demo-attributes.adb
+++ b/Ada95/samples/sample-curses_demo-attributes.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998,2003 Free Software Foundation, Inc.                   --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2002,2003 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.13 $
+--  $Revision: 1.14 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Terminal_Interface.Curses; use Terminal_Interface.Curses;
diff --git a/Ada95/samples/sample-curses_demo-attributes.ads b/Ada95/samples/sample-curses_demo-attributes.ads
index d1032d99aed1..636c12f35b9e 100644
--- a/Ada95/samples/sample-curses_demo-attributes.ads
+++ b/Ada95/samples/sample-curses_demo-attributes.ads
@@ -7,7 +7,8 @@
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998,2003 Free Software Foundation, Inc.                   --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2002,2003 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.10 $
+--  $Revision: 1.11 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 package Sample.Curses_Demo.Attributes is
diff --git a/Ada95/samples/sample-curses_demo-mouse.adb b/Ada95/samples/sample-curses_demo-mouse.adb
index 490685c75076..d388e4c81c0e 100644
--- a/Ada95/samples/sample-curses_demo-mouse.adb
+++ b/Ada95/samples/sample-curses_demo-mouse.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2006,2008 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.16 $
---  $Date: 2008/07/26 18:48:19 $
+--  $Revision: 1.17 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Terminal_Interface.Curses; use Terminal_Interface.Curses;
diff --git a/Ada95/samples/sample-curses_demo-mouse.ads b/Ada95/samples/sample-curses_demo-mouse.ads
index e48834dfe75d..fbaebab63be8 100644
--- a/Ada95/samples/sample-curses_demo-mouse.ads
+++ b/Ada95/samples/sample-curses_demo-mouse.ads
@@ -7,7 +7,8 @@
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998,2003 Free Software Foundation, Inc.                   --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2002,2003 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.10 $
+--  $Revision: 1.11 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 package Sample.Curses_Demo.Mouse is
diff --git a/Ada95/samples/sample-curses_demo.adb b/Ada95/samples/sample-curses_demo.adb
index 4dd96a721d2a..f342a3250bd3 100644
--- a/Ada95/samples/sample-curses_demo.adb
+++ b/Ada95/samples/sample-curses_demo.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2004,2011 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2004,2011 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.17 $
---  $Date: 2011/03/23 00:29:04 $
+--  $Revision: 1.18 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Terminal_Interface.Curses; use Terminal_Interface.Curses;
diff --git a/Ada95/samples/sample-curses_demo.ads b/Ada95/samples/sample-curses_demo.ads
index 2ee0d9d24095..264c4c01b492 100644
--- a/Ada95/samples/sample-curses_demo.ads
+++ b/Ada95/samples/sample-curses_demo.ads
@@ -7,7 +7,8 @@
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998,2003 Free Software Foundation, Inc.                   --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2002,2003 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.10 $
+--  $Revision: 1.11 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 package Sample.Curses_Demo is
diff --git a/Ada95/samples/sample-explanation.adb_p b/Ada95/samples/sample-explanation.adb_p
index e1752df137a2..f99ceb6f7550 100644
--- a/Ada95/samples/sample-explanation.adb_p
+++ b/Ada95/samples/sample-explanation.adb_p
@@ -7,7 +7,7 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2014,2019 Free Software Foundation, Inc.              --
+-- Copyright 2019,2020 Thomas E. Dickey                                     --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +35,8 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.4 $
---  $Date: 2019/09/08 00:14:54 $
+--  $Revision: 1.5 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 --  Poor mans help system. This scans a sequential file for key lines and
diff --git a/Ada95/samples/sample-explanation.ads b/Ada95/samples/sample-explanation.ads
index 728825e2c9d7..6e955b4b6224 100644
--- a/Ada95/samples/sample-explanation.ads
+++ b/Ada95/samples/sample-explanation.ads
@@ -7,7 +7,8 @@
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2003,2009 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.11 $
+--  $Revision: 1.12 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 --  Poor mans help system. This scans a sequential file for key lines and
diff --git a/Ada95/samples/sample-form_demo-aux.adb b/Ada95/samples/sample-form_demo-aux.adb
index a3b044dcc3eb..072b1871a8d3 100644
--- a/Ada95/samples/sample-form_demo-aux.adb
+++ b/Ada95/samples/sample-form_demo-aux.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2004,2009 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2004,2009 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.17 $
---  $Date: 2009/12/26 17:38:58 $
+--  $Revision: 1.18 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Ada.Characters.Latin_1; use Ada.Characters.Latin_1;
diff --git a/Ada95/samples/sample-form_demo-aux.ads b/Ada95/samples/sample-form_demo-aux.ads
index 7e7f7cd21e39..7e7f28670e4e 100644
--- a/Ada95/samples/sample-form_demo-aux.ads
+++ b/Ada95/samples/sample-form_demo-aux.ads
@@ -7,7 +7,8 @@
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2009,2011 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.11 $
+--  $Revision: 1.12 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Terminal_Interface.Curses; use  Terminal_Interface.Curses;
diff --git a/Ada95/samples/sample-form_demo-handler.adb b/Ada95/samples/sample-form_demo-handler.adb
index d871c1cc7796..d180b1d58b25 100644
--- a/Ada95/samples/sample-form_demo-handler.adb
+++ b/Ada95/samples/sample-form_demo-handler.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2004,2009 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2004,2009 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.14 $
---  $Date: 2009/12/26 17:38:58 $
+--  $Revision: 1.15 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Sample.Form_Demo.Aux;
diff --git a/Ada95/samples/sample-form_demo-handler.ads b/Ada95/samples/sample-form_demo-handler.ads
index 7d875a0fff6c..8966e5bcc58d 100644
--- a/Ada95/samples/sample-form_demo-handler.ads
+++ b/Ada95/samples/sample-form_demo-handler.ads
@@ -7,7 +7,8 @@
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2003,2009 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.10 $
+--  $Revision: 1.11 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Terminal_Interface.Curses;
diff --git a/Ada95/samples/sample-form_demo.adb b/Ada95/samples/sample-form_demo.adb
index ed84526feae2..72ca51c46dd9 100644
--- a/Ada95/samples/sample-form_demo.adb
+++ b/Ada95/samples/sample-form_demo.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2006,2011 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2006,2011 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.16 $
---  $Date: 2011/03/23 00:44:12 $
+--  $Revision: 1.17 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Terminal_Interface.Curses; use Terminal_Interface.Curses;
diff --git a/Ada95/samples/sample-form_demo.ads b/Ada95/samples/sample-form_demo.ads
index ebdb0d42bba8..0dda0711197f 100644
--- a/Ada95/samples/sample-form_demo.ads
+++ b/Ada95/samples/sample-form_demo.ads
@@ -7,7 +7,8 @@
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998,2003 Free Software Foundation, Inc.                   --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2002,2003 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.10 $
+--  $Revision: 1.11 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 package Sample.Form_Demo is
diff --git a/Ada95/samples/sample-function_key_setting.adb b/Ada95/samples/sample-function_key_setting.adb
index 4ff70be7bb8a..6c5a804f61df 100644
--- a/Ada95/samples/sample-function_key_setting.adb
+++ b/Ada95/samples/sample-function_key_setting.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2009,2011 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.15 $
---  $Date: 2011/03/23 00:44:12 $
+--  $Revision: 1.16 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Ada.Unchecked_Deallocation;
diff --git a/Ada95/samples/sample-function_key_setting.ads b/Ada95/samples/sample-function_key_setting.ads
index 4188158f05c9..daf14534b123 100644
--- a/Ada95/samples/sample-function_key_setting.ads
+++ b/Ada95/samples/sample-function_key_setting.ads
@@ -7,7 +7,8 @@
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2009,2011 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2009,2011 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,7 +36,7 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.11 $
+--  $Revision: 1.12 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Terminal_Interface.Curses; use Terminal_Interface.Curses;
diff --git a/Ada95/samples/sample-header_handler.adb b/Ada95/samples/sample-header_handler.adb
index f552e20ee5df..572aa8aa62b5 100644
--- a/Ada95/samples/sample-header_handler.adb
+++ b/Ada95/samples/sample-header_handler.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998-2011,2014 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2011,2014 Free Software Foundation, Inc.                  --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
@@ -35,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control
---  $Revision: 1.20 $
---  $Date: 2014/09/13 19:10:18 $
+--  $Revision: 1.21 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Ada.Calendar; use Ada.Calendar;
diff --git a/Ada95/samples/sample-header_handler.ads b/Ada95/samples/sample-header_handler.ads
index a81379dc8c19..18f76d70d726 100644
--- a/Ada95/samples/sample-header_handler.ads
+++ b/Ada95/samples/sample-header_handler.ads
@@ -7,7 +7,8 @@
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998,2003 Free Software Foundation, Inc.                   --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 1998-2002,2003 Free Software Foundation, Inc.                  --