From: Thomas E. Dickey Date: Sun, 20 Jun 2021 00:21:42 +0000 (+0000) Subject: ncurses 6.2 - patch 20210619 X-Git-Tag: v6.3~21 X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=9f479192e3ca3413d235c66bf058f8cc63764898 ncurses 6.2 - patch 20210619 + improve configure-macro used for dependencies of --disable-leaks such as --with-valgrind + trim trailing blanks from files --- diff --git a/AUTHORS b/AUTHORS index 0018842c..09dfc9a9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2021 Thomas E. Dickey -- -- Copyright 2006,2017 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,13 +26,13 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: AUTHORS,v 1.4 2020/02/02 23:34:34 tom Exp $ +-- $Id: AUTHORS,v 1.5 2021/06/17 21:20:30 tom Exp $ ------------------------------------------------------------------------------- These are the principal authors/contributors of ncurses since 1.9.9e, in decreasing order of their contribution: TD Thomas E. Dickey -JPF Juergen Pfeifer +JPF Juergen Pfeifer ESR Eric S Raymond AVL Alexander V Lukyanov PB Philippe Blain diff --git a/Ada95/README b/Ada95/README index d014f327..2e66625f 100644 --- a/Ada95/README +++ b/Ada95/README @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2021 Thomas E. Dickey -- -- Copyright 1998-2002,2003 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -29,6 +29,6 @@ -- Author: Juergen Pfeifer, 1996 -The documentation is provided in HTML format in the ./html +The documentation is provided in HTML format in the ./html subdirectory. The main document is named index.html diff --git a/Ada95/TODO b/Ada95/TODO index 122275f9..15323458 100644 --- a/Ada95/TODO +++ b/Ada95/TODO @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2021 Thomas E. Dickey -- -- Copyright 1998-1999,2006 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: TODO,v 1.6 2020/02/02 23:34:34 tom Exp $ +-- $Id: TODO,v 1.7 2021/06/17 21:20:30 tom Exp $ ------------------------------------------------------------------------------- -- Intensive testing @@ -36,7 +36,7 @@ Like most WEB pages: under continuous construction -- Style cleanup - + -- Alternate functions for procedures with out params Comfort purpose diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index bf7cca0f..e2bc2cd7 100644 --- a/Ada95/aclocal.m4 +++ b/Ada95/aclocal.m4 @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: aclocal.m4,v 1.175 2021/05/19 23:35:25 tom Exp $ +dnl $Id: aclocal.m4,v 1.176 2021/06/19 23:44:07 tom Exp $ dnl Macros used in NCURSES Ada95 auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -827,7 +827,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_CONST_X_STRING version: 6 updated: 2021/01/01 13:31:04 +dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17 dnl ----------------- dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most dnl character-strings. @@ -857,7 +857,7 @@ AC_TRY_COMPILE( #include #include ], -[String foo = malloc(1); (void)foo],[ +[String foo = malloc(1); free((void*)foo)],[ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[ AC_TRY_COMPILE( @@ -887,7 +887,7 @@ esac ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CONST_X_STRING version: 6 updated: 2021/01/01 13:31:04 +dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17 dnl ----------------- dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most dnl character-strings. @@ -917,7 +917,7 @@ AC_TRY_COMPILE( #include #include ], -[String foo = malloc(1); (void)foo],[ +[String foo = malloc(1); free((void*)foo)],[ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[ AC_TRY_COMPILE( diff --git a/Ada95/configure b/Ada95/configure index 39766b3f..ac4da280 100755 --- a/Ada95/configure +++ b/Ada95/configure @@ -15081,7 +15081,7 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -String foo = malloc(1); (void)foo +String foo = malloc(1); free((void*)foo) ; return 0; } diff --git a/Ada95/include/ncurses_defs b/Ada95/include/ncurses_defs index 7a7059bf..50da8e5c 100644 --- a/Ada95/include/ncurses_defs +++ b/Ada95/include/ncurses_defs @@ -1,6 +1,6 @@ -# $Id: ncurses_defs,v 1.45 2020/02/02 23:34:34 tom Exp $ +# $Id: ncurses_defs,v 1.46 2021/06/17 21:20:30 tom Exp $ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2021 Thomas E. Dickey # # Copyright 2008-2012,2013 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -44,7 +44,7 @@ GCC_UNUSED /* nothing */ HAVE_BIG_CORE HAVE_BSD_CGETENT HAVE_BSD_SIGNAL_H -HAVE_BTOWC +HAVE_BTOWC HAVE_BUILTIN_H HAVE_CHGAT 1 HAVE_COLOR_SET 1 @@ -101,7 +101,7 @@ HAVE_PANEL_H HAVE_POLL HAVE_POLL_H HAVE_PURIFY -HAVE_PUTWC +HAVE_PUTWC HAVE_PUTWIN 1 HAVE_REGEXPR_H_FUNCS HAVE_REGEXP_H_FUNCS @@ -156,7 +156,7 @@ HAVE_VSNPRINTF HAVE_VSSCANF HAVE_WCSRTOMBS HAVE_WCSTOMBS -HAVE_WCTOB +HAVE_WCTOB HAVE_WCTOMB HAVE_WCTYPE_H HAVE_WINSSTR 1 diff --git a/Ada95/make-tar.sh b/Ada95/make-tar.sh index e88b3128..5a99fb9d 100755 --- a/Ada95/make-tar.sh +++ b/Ada95/make-tar.sh @@ -1,7 +1,7 @@ #!/bin/sh -# $Id: make-tar.sh,v 1.18 2020/02/02 23:34:34 tom Exp $ +# $Id: make-tar.sh,v 1.19 2021/06/17 21:26:02 tom Exp $ ############################################################################## -# Copyright 2019,2020 Thomas E. Dickey # +# Copyright 2019-2020,2021 Thomas E. Dickey # # Copyright 2010-2015,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -128,10 +128,10 @@ cp -p $SOURCE/NEWS $BUILD/$ROOTNAME # cleanup empty directories (an artifact of ncurses source archives) -touch $BUILD/$ROOTNAME/MANIFEST +touch $BUILD/$ROOTNAME/MANIFEST ( cd $BUILD/$ROOTNAME && find . -type f -print |$SOURCE/misc/csort >MANIFEST ) -cd $BUILD || exit +cd $BUILD || exit # Remove build-artifacts. find . -name RCS -exec rm -rf {} \; diff --git a/Ada95/package/debian/rules b/Ada95/package/debian/rules index 708d3eb2..47bbdc04 100755 --- a/Ada95/package/debian/rules +++ b/Ada95/package/debian/rules @@ -71,7 +71,7 @@ install-stamp: build-stamp dh_installdirs $(MAKE) install DESTDIR=$(TARGET_DIR) - + # FIXME: it would be nice to make these into separate packages ( cd samples && $(MAKE) install.examples DESTDIR=$(TARGET_DIR) BINDIR=$(SAMPLE_DIR) ) ( cd doc && $(MAKE) install.html DESTDIR=$(TARGET_DIR) ) diff --git a/Ada95/samples/Makefile.in b/Ada95/samples/Makefile.in index 3a0c272f..495f7083 100644 --- a/Ada95/samples/Makefile.in +++ b/Ada95/samples/Makefile.in @@ -29,7 +29,7 @@ # # Author: Juergen Pfeifer, 1996 # -# $Id: Makefile.in,v 1.62 2021/01/23 20:42:08 tom Exp $ +# $Id: Makefile.in,v 1.63 2021/06/17 21:11:08 tom Exp $ # .SUFFIXES: @@ -107,7 +107,7 @@ THISLIB = sample CARGS = -cargs $(ADAFLAGS) LARGS = -largs -L../lib -l@ADA_LIBNAME@ @TEST_ARG2@ $(LD_FLAGS) @TEST_LIBS2@ -PROGS = tour$x ncurses$x @USE_GNAT_SIGINT@ rain$x +PROGS = tour$x ncurses$x @USE_GNAT_SIGINT@ rain$x all :: $(PROGS) @echo made $@ diff --git a/Ada95/samples/explain.txt b/Ada95/samples/explain.txt index be2cba15..d36d4ea7 100644 --- a/Ada95/samples/explain.txt +++ b/Ada95/samples/explain.txt @@ -27,15 +27,15 @@ In a menu you can use the following Keys in the whole application: - Cursor Right Right one item - END Key Go to last item #FORMKEYS - - CTRL-X eXit the form + - CTRL-X eXit the form - CTRL-F Go forward to the next field - CTRL-B Go backward to the previous field - - CTRL-L Go to the field left of the current one + - CTRL-L Go to the field left of the current one - CTRL-R Go to the field right of the current one - - CTRL-U Go to the field above the current one - - CTRL-D Go to the field below the current one + - CTRL-U Go to the field above the current one + - CTRL-D Go to the field below the current one - - CTRL-W Go to the next word in the field + - CTRL-W Go to the next word in the field - CTRL-T Go to the previous word in the field - CTRL-A Go to the beginning of the field @@ -43,13 +43,13 @@ In a menu you can use the following Keys in the whole application: - CTRL-I Insert a blank character at the current position - CTRL-O Insert a line - - CTRL-V Delete a character - - CTRL-H Delete previous character - - CTRL-Y Delete a line - - CTRL-G Delete a word - - CTRL-K Clear to end of field + - CTRL-V Delete a character + - CTRL-H Delete previous character + - CTRL-Y Delete a line + - CTRL-G Delete a word + - CTRL-K Clear to end of field - - CTRL-N Next choice in a choice field (Enumerations etc.) + - CTRL-N Next choice in a choice field (Enumerations etc.) - CTRL-P Previous choice in a choice field. #HELP #HELPKEYS @@ -62,7 +62,7 @@ You may leave the help with the Function Key labeled 'Quit'. This is the main menu of the sample program for the ncurses Ada95 binding. The main intention of the demo is not to demonstrate or test all the features of ncurses and it's subsystems, but to provide -to you some sample code how to use the binding with Ada95. +to you some sample code how to use the binding with Ada95. You may select this options: @@ -71,7 +71,7 @@ You may select this options: * Look at some features of the form subsystem * Look at the output of the Ada.Text_IO like functions for ncurses. - + #MAINPAD You may press at any place in this demo CTRL-C. This will give you a command window. You can just type in the Label-String of a function key, then this @@ -86,13 +86,13 @@ descriptions for the items, a marker and a padding character between the item name and the description. #MENU01 This is a demo of the some of the menu layout options. One of them -is the spacing functionality. Just press the Key labeled "Flip" to +is the spacing functionality. Just press the Key labeled "Flip" to flip between the non-spaced and a spaced version of the menu. Please -note that this functionality is unique for ncurses and is not found -in the SVr4 menu implementation. +note that this functionality is unique for ncurses and is not found +in the SVr4 menu implementation. -This is a menu that sometimes does not fit into it's window and -therefore it becomes a scroll menu. +This is a menu that sometimes does not fit into it's window and +therefore it becomes a scroll menu. You can also see here very nicely the pattern matching functionality of menus. Type for example a 'J' and you will be positioned to the @@ -106,7 +106,7 @@ labeled "4x1", "4x2" or "4x3" to get a menu with that many rows and columns. With the Keys "O-Row" or "O-Col" (they occupy the same label and -switch on selection) you can change the major order scheme for +switch on selection) you can change the major order scheme for the menu. If "O-Col" is visible, the menu is currently major ordered by rows, you can switch to major column order by pressing the key. If "O-Row" is visible, it's just the reverse situation. @@ -136,7 +136,7 @@ For more details press the Key labeled "Help". This is a demo of the forms package. #FORM-PAD00 Please note that this demo is far from being complete. It really shows -only a small part of the functionality of the forms package. Let's hope +only a small part of the functionality of the forms package. Let's hope the next version will have a richer demo (You want to contribute ?). #NOTIMPL Sorry this functionality of the demo is not implemented at the moment. @@ -148,7 +148,7 @@ This is a menu where you can select some different demos of the ncurses functionality. #CURSES-PAD00 Please note that this demo is far from being complete. It really shows -only a small part of the functionality of the curses package. Let's hope +only a small part of the functionality of the curses package. Let's hope the next version will have a richer demo (You want to contribute ?). #MOUSEKEYS In this demo you may use this keys: @@ -161,11 +161,11 @@ You may click the mouse buttons at any location at the screen and look at the protocol window ! #MOUSE00 A rather simple use of a mouse as demo. It's there just to test the -code and to provide the sample source. +code and to provide the sample source. It might be of interest, that the output into the protocol window is done by the (n)curses Text_IO subpackages. Especially the output of -the button and state names is done by Ads's enumeration IO, which +the button and state names is done by Ads's enumeration IO, which allows you to print the names of enumeration literals. That's really nice. #MOUSE-PAD00 diff --git a/INSTALL b/INSTALL index dddedd11..8ea212e6 100644 --- a/INSTALL +++ b/INSTALL @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: INSTALL,v 1.229 2021/04/17 22:26:34 tom Exp $ +-- $Id: INSTALL,v 1.230 2021/06/17 21:11:08 tom Exp $ --------------------------------------------------------------------- How to install Ncurses/Terminfo on your system --------------------------------------------------------------------- @@ -2197,7 +2197,7 @@ CONFIGURING FALLBACK ENTRIES: tree is accessible (that is, in single-user mode or at OS installation time) the ncurses library can be compiled to include an array of pre-fetched fallback entries. - + NOTE: This must be done on a machine which has ncurses' infocmp and terminfo database installed (as well as ncurses' tic and infocmp programs). That is because the fallback sources are generated and diff --git a/Makefile.os2 b/Makefile.os2 index 960c2bdb..bc3407d6 100644 --- a/Makefile.os2 +++ b/Makefile.os2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2021 Thomas E. Dickey # # Copyright 1998-2000,2006 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ################################################################################ -# $Id: Makefile.os2,v 1.12 2020/02/02 23:34:34 tom Exp $ +# $Id: Makefile.os2,v 1.13 2021/06/17 21:20:30 tom Exp $ # # Wrapper Makefile for ncurses library under OS/2. # Author: Juan Jose Garcia Ripoll . @@ -70,7 +70,7 @@ # disappear are not essential. # # I first thought about killing '_nc_*' symbols, but it seems that some of -# them --_nc_panel_hook, _nc_ada*, etc-- are needed outside ncurses.dll. +# them --_nc_panel_hook, _nc_ada*, etc-- are needed outside ncurses.dll. # However, the whole size of the export table will not be larger than 1k or # so. # diff --git a/NEWS b/NEWS index 3265d19f..4b1e7d3c 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3673 2021/06/13 00:16:30 tom Exp $ +-- $Id: NEWS,v 1.3676 2021/06/19 19:09:22 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,11 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20210619 + + improve configure-macro used for dependencies of --disable-leaks such + as --with-valgrind + + trim trailing blanks from files + 20210612 + fixes for scan-build, valgrind build/testing. + update config.guess @@ -119,7 +124,7 @@ it is not possible to add this information. + relax modification-time comparison in CF_LINK_FUNCS to allow it to accept link() function with NFS filesystems which change the mtime on the link target, e.g., several BSD systems. - + call delay_output_sp to handle BSD-style padding when tputs_sp is + + call delay_output_sp to handle BSD-style padding when tputs_sp is called, whether directly or internally, to ensure that the SCREEN pointer is passed correctly (reports by Henric Jungheim, Juraj Lutter). diff --git a/README b/README index a48e3f61..84998f23 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2021 Thomas E. Dickey -- -- Copyright 1998-2012,2018 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: README,v 1.28 2020/02/02 23:34:34 tom Exp $ +-- $Id: README,v 1.29 2021/06/17 21:20:30 tom Exp $ ------------------------------------------------------------------------------- README file for the ncurses package @@ -37,7 +37,7 @@ See the file TO-DO for things that still need doing, including known bugs. Browse the file misc/ncurses-intro.html for narrative descriptions of how to use ncurses and the panel, menu, and form libraries. - + Browse the file doc/html/hackguide.html for a tour of the package internals. ROADMAP AND PACKAGE OVERVIEW: @@ -45,7 +45,7 @@ ROADMAP AND PACKAGE OVERVIEW: You should be reading this file in a directory called: ncurses-d.d, where d.d is the current version number (see the dist.mk file in this directory for that). There should be a number of subdirectories, including `c++', `form', -`man', `menu', `misc', `ncurses', `panel', `progs', `test', 'tack' and `Ada95'. +`man', `menu', `misc', `ncurses', `panel', `progs', `test', 'tack' and `Ada95'. (The 'tack' program may be distributed separately). A full build/install of this package typically installs several libraries, a @@ -149,7 +149,7 @@ help you systematically exercise the library functions. AUTHORS: -Pavel Curtis: +Pavel Curtis: wrote the original ncurses Zeyd M. Ben-Halim: diff --git a/README.emx b/README.emx index c48b312c..666eaec7 100644 --- a/README.emx +++ b/README.emx @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2021 Thomas E. Dickey -- -- Copyright 1998-2006,2018 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: README.emx,v 1.11 2020/02/02 23:34:34 tom Exp $ +-- $Id: README.emx,v 1.12 2021/06/17 21:20:30 tom Exp $ -- Author: Thomas Dickey ------------------------------------------------------------------------------- @@ -34,7 +34,7 @@ You can build ncurses on OS/2 in the EMX environment. But you must build and acquire tools. Not all of the tools distributed with EMX work properly, and some additional ones are required. -First, the configure script distributed with ncurses will not run as-is in EMX. +First, the configure script distributed with ncurses will not run as-is in EMX. You can generate a new one if you have autoconf built for EMX. You will need the EMX development tools, of course. Get these programs to start: @@ -65,7 +65,7 @@ may fix these problems: + I also built from sources (because the distributed binaries did not work) the cmp, diff programs. - + Other required utilities such as ar, cat, chmod, cp, gawk, grep, mv, ls, rm, mkdir, sed, sort and tr worked. diff --git a/VERSION b/VERSION index 9c6a6134..c54fc1f1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.2 20210612 +5:0:10 6.2 20210619 diff --git a/aclocal.m4 b/aclocal.m4 index d48cde0c..02a57484 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.961 2021/05/19 23:35:25 tom Exp $ +dnl $Id: aclocal.m4,v 1.963 2021/06/19 23:41:36 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -1603,7 +1603,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_CONST_X_STRING version: 6 updated: 2021/01/01 13:31:04 +dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17 dnl ----------------- dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most dnl character-strings. @@ -1633,7 +1633,7 @@ AC_TRY_COMPILE( #include #include ], -[String foo = malloc(1); (void)foo],[ +[String foo = malloc(1); free((void*)foo)],[ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[ AC_TRY_COMPILE( @@ -2964,7 +2964,7 @@ rm -rf ./conftest* AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GETOPT_HEADER version: 7 updated: 2021/01/01 13:31:04 +dnl CF_GETOPT_HEADER version: 8 updated: 2021/06/19 19:16:16 dnl ---------------- dnl Check for getopt's variables which are commonly defined in stdlib.h, dnl unistd.h or (nonstandard) in getopt.h @@ -2977,7 +2977,7 @@ for cf_header in stdio.h stdlib.h unistd.h getopt.h do AC_TRY_COMPILE([ #include <$cf_header>], -[int x = optind; char *y = optarg], +[int x = optind; char *y = optarg; (void)x; (void)y], [cf_cv_getopt_header=$cf_header break]) done @@ -5986,19 +5986,29 @@ then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NO_LEAKS_OPTION version: 8 updated: 2021/01/05 20:05:09 +dnl CF_NO_LEAKS_OPTION version: 9 updated: 2021/06/13 19:45:41 dnl ------------------ dnl see CF_WITH_NO_LEAKS +dnl +dnl $1 = option/name +dnl $2 = help-text +dnl $3 = symbol to define if the option is set +dnl $4 = additional actions to take if the option is set AC_DEFUN([CF_NO_LEAKS_OPTION],[ AC_MSG_CHECKING(if you want to use $1 for testing) AC_ARG_WITH($1, [$2], - [AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[ + [case "x$withval" in + (x|xno) ;; + (*) + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" + with_$1=yes + AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[ $4 ]) - : "${with_cflags:=-g}" - : "${enable_leaks:=no}" - with_$1=yes], + ;; + esac], [with_$1=]) AC_MSG_RESULT(${with_$1:-no}) diff --git a/announce.html.in b/announce.html.in index 84b9d429..9651b06f 100644 --- a/announce.html.in +++ b/announce.html.in @@ -1,7 +1,7 @@ @@ -41,7 +41,7 @@

ADACURSES 1 User Commands

-ADACURSES(1)                     User Commands                    ADACURSES(1)
+ADACURSES(1)                     User Commands                    ADACURSES(1)
 
 
 
@@ -51,7 +51,7 @@
 
 
 

SYNOPSIS

-       adacurses6-config [options]
+       adacurses6-config [options]
 
 
 

DESCRIPTION

@@ -60,20 +60,20 @@
 
 
 

OPTIONS

-       --cflags
+       --cflags
               echos the gnat (Ada  compiler)  flags  needed  to  compile  with
               AdaCurses.
 
-       --libs echos the gnat libraries needed to link with AdaCurses.
+       --libs echos the gnat libraries needed to link with AdaCurses.
 
-       --version
+       --version
               echos  the  release+patchdate  version  of the ncurses libraries
               used to configure and build AdaCurses.
 
-       --help prints a list of the adacurses6-config script's options.
+       --help prints a list of the adacurses6-config script's options.
 
-       If no options are given, adacurses6-config prints  the  combination  of
-       --cflags and --libs that gnatmake expects (see example).
+       If no options are given, adacurses6-config prints  the  combination  of
+       --cflags and --libs that gnatmake expects (see example).
 
 
 

EXAMPLE

@@ -124,13 +124,13 @@
 
 
 

SEE ALSO

-       curses(3x)
+       curses(3X)
 
-       This describes ncurses version 6.2 (patch 20210522).
+       This describes ncurses version 6.2 (patch 20210612).
 
 
 
-                                                                  ADACURSES(1)
+                                                                  ADACURSES(1)