minor, mostly build updates

* configure.ac: support setting of PANEL_LIBS independents of CURSES_LIBS
* ABOUT-NLS, INSTALL: replaced by current versions
* Makefile.am (FILES_TO_BE_EXECUTABLE): added doc/cobcinfo.sh
* bin/* Makefile.am (cobconfig.1, cobcrun.1), cobc/Makefile.am (cobc.1): add description using help2man -n
* tests/atlocal.in: adjusted to handle newer MSYS2's setting OSTYPE=cygwin
* build_aux:
  * pre-inst-env.in: drop COB_ON_CYGWIN as it is set via atlocal for testsuite checks
  * missing: updated to recent version from https://git.savannah.gnu.org/cgit/automake.git/tree/lib/

Author: sf-mensch

ABOUT-NLS

@@ -1,4 +1,9 @@
 
+2025-03-16  Simon Sobisch <simonsobisch@gnu.org>
+
+	* configure.ac: support setting of PANEL_LIBS independent of CURSES_LIBS
+	* ABOUT-NLS, INSTALL: replaced by current versions
+
 2025-02-11  Simon Sobisch <simonsobisch@gnu.org>
 
 	* configure.ac: fix warning for \ in AC_CHECK_FUNCS by dropping them
@@ -14,6 +19,10 @@
 	* configure.ac: only check for IBM/OpenWatcom/Sun's C compilers if not
 	  running under GCC / clang
 
+2024-12-09  Simon Sobisch <simonsobisch@gnu.org>
+
+	* Makefile.am (FILES_TO_BE_EXECUTABLE): added doc/cobcinfo.sh
+
 2024-12-08  Simon Sobisch <simonsobisch@gnu.org>
 
 	* configure.ac: fix check for curses functions if panel headers are found

ChangeLog

@@ -1,7 +1,7 @@
 #
 # Makefile gnucobol
 #
-# Copyright (C) 2003-2012, 2014-2020, 2023 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012, 2014-2020, 2023-2024 Free Software Foundation, Inc.
 # Written by Keisuke Nishida, Roger While, Simon Sobisch
 #
 # This file is part of GnuCOBOL.
@@ -51,7 +51,8 @@ FILES_TO_BE_EXECUTABLE = $(dist_noinst_SCRIPTS) \
 	configure tests/testsuite tests/testsuite_manual tests/listings-sed.sh \
 	build_aux/config.guess build_aux/config.sub build_aux/config.rpath \
 	build_aux/depcomp build_aux/install-sh build_aux/ltmain.sh build_aux/mdate-sh \
-	build_aux/missing build_aux/mkinstalldirs build_aux/ylwrap
+	build_aux/missing build_aux/mkinstalldirs build_aux/ylwrap \
+	doc/cobcinfo.sh
 
 tarstamps = $(top_distdir)/tarstamp.h tarstamp.h
 

INSTALL

@@ -1,4 +1,8 @@
 
+2024-12-09  Simon Sobisch <simonsobisch@gnu.org>
+
+	* Makefile.am (cobconfig.1, cobcrun.1): add description using help2man -n
+
 2024-10-02  Simon Sobisch <simonsobisch@gnu.org>
 
 	* cobcrun.c (cobcrun_print_version): build and package data only

Makefile.am

@@ -1,7 +1,7 @@
 #
 # Makefile gnucobol/bin
 #
-# Copyright (C) 2001-2012, 2014, 2017-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012, 2014, 2017-2020, 2024 Free Software Foundation, Inc.
 # Written by Roger While, Simon Sobisch
 #
 # This file is part of GnuCOBOL.
@@ -46,18 +46,21 @@ MAINTAINERCLEANFILES = cobcrun.1
 HELPSOURCES_COBCRUN = cobcrun.c $(top_srcdir)/configure.ac
 HELPSOURCES_COBCONFIG = cob-config.in $(top_srcdir)/configure.ac
 HELP2MAN_OPTS = --info-page=$(PACKAGE)
+HELP2MAN_OPTS_COBCRUN = $(HELP2MAN_OPTS) -v "-qV" -n "starts the COBOL runtime environment with optional configuration and displays active configuration details"
+HELP2MAN_OPTS_COBCONFIG = $(HELP2MAN_OPTS) -n "prints configuration variables for libcob"
 
 if MAKE_HAS_PREREQ_ONLY
 cobcrun.1: $(HELPSOURCES_COBCRUN) | $(COBCRUN)
-	"$(top_builddir)/pre-inst-env" $(HELP2MAN) --output=$@ $(HELP2MAN_OPTS) $(COBCRUN)
+	"$(top_builddir)/pre-inst-env" $(HELP2MAN) --output=$@ $(HELP2MAN_OPTS_COBCRUN) $(COBCRUN)
 else
 cobcrun.1: $(HELPSOURCES_COBCRUN)
-	"$(top_builddir)/pre-inst-env" $(HELP2MAN) --output=$@ $(HELP2MAN_OPTS) $(COBCRUN)
+	"$(top_builddir)/pre-inst-env" $(HELP2MAN) --output=$@ $(HELP2MAN_OPTS_COBCRUN) $(COBCRUN)
 endif
 
 if MAKE_HAS_PREREQ_ONLY
 cob-config.1: $(HELPSOURCES_COBCONFIG) | ./cob-config
-	$(HELP2MAN) --output=$@ $(HELP2MAN_OPTS) ./cob-config
+	$(HELP2MAN) --output=$@ $(HELP2MAN_OPTS_COBCONFIG) ./cob-config
 else
-	$(HELP2MAN) --output=$@ $(HELP2MAN_OPTS) ./cob-config
+cob-config.1: $(HELPSOURCES_COBCONFIG)
+	$(HELP2MAN) --output=$@ $(HELP2MAN_OPTS_COBCONFIG) ./cob-config
 endif

bin/ChangeLog

@@ -1,4 +1,11 @@
 
+2025-02-13  Simon Sobisch <simonsobisch@gnu.org>
+
+	* pre-inst-env.in: drop COB_ON_CYGWIN as it is set via atlocal for
+	  testsuite checks
+	* missing: updated to recent version from
+	  https://git.savannah.gnu.org/cgit/automake.git/tree/lib/
+
 2024-09-02  Simon Sobisch <simonsobisch@gnu.org>
 
 	* ar-lib, config.guess, config.rpath, config.sub, texinfo.tex: updated
@@ -186,7 +193,7 @@
 	  without uname(1) [removed 2014-01-25] from old version
 
 
-Copyright 2015-2024 Free Software Foundation, Inc.
+Copyright 2015-2025 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification, are
 permitted provided the copyright notice and this notice are preserved.

bin/Makefile.am

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2024-06-19.01; # UTC
 
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -143,7 +143,7 @@ func_cl_wrapper ()
 	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
 	  eat=1
 	  case $2 in
-	    *.o | *.[oO][bB][jJ])
+	    *.o | *.lo | *.[oO][bB][jJ])
 	      func_file_conv "$2"
 	      set x "$@" -Fo"$file"
 	      shift
@@ -248,14 +248,17 @@ If you are trying to build a whole package this is not the
 right script to run: please start by reading the file 'INSTALL'.
 
 Report bugs to <bug-automake@gnu.org>.
+GNU Automake home page: <https://www.gnu.org/software/automake/>.
+General help using GNU software: <https://www.gnu.org/gethelp/>.
 EOF
     exit $?
     ;;
   -v | --v*)
-    echo "compile $scriptversion"
+    echo "compile (GNU Automake) $scriptversion"
     exit $?
     ;;
   cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \
   icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;

build_aux/ChangeLog

@@ -1,9 +1,11 @@
 #! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
+# Common wrapper for a few potentially missing GNU and other programs.
 
-scriptversion=2017-12-05.17gnucobol; # UTC
+scriptversion=2024-12-03.03; # UTC
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells
+
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -54,18 +56,20 @@ Options:
   -v, --version   output version information and exit
 
 Supported PROGRAM values:
-  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
-  bison     yacc      flex         lex       help2man
+aclocal autoconf autogen  autoheader autom4te automake autoreconf
+bison   flex     help2man lex        makeinfo perl     yacc
 
 Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
 'g' are ignored when checking the name.
 
-Send bug reports to <bug-automake@gnu.org>."
+Report bugs to <bug-automake@gnu.org>.
+GNU Automake home page: <https://www.gnu.org/software/automake/>.
+General help using GNU software: <https://www.gnu.org/gethelp/>."
     exit $?
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
+    echo "missing (GNU Automake) $scriptversion"
     exit $?
     ;;
 
@@ -108,7 +112,7 @@ gnu_software_URL=https://www.gnu.org/software
 program_details ()
 {
   case $1 in
-    aclocal|automake)
+    aclocal|automake|autoreconf)
       echo "The '$1' program is part of the GNU Automake package:"
       echo "<$gnu_software_URL/automake>"
       echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
@@ -123,6 +127,9 @@ program_details ()
       echo "<$gnu_software_URL/m4/>"
       echo "<$perl_URL>"
       ;;
+    *)
+      :
+      ;;
   esac
 }
 
@@ -137,48 +144,55 @@ give_advice ()
   printf '%s\n' "'$1' is $msg."
 
   configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  autoheader_deps="'acconfig.h'"
+  automake_deps="'Makefile.am'"
+  aclocal_deps="'acinclude.m4'"
   case $normalized_program in
+    aclocal*)
+      echo "You should only need it if you modified $aclocal_deps or"
+      echo "$configure_deps."
+      ;;
     autoconf*)
-      echo "You should only need it if you modified 'configure.ac',"
-      echo "or m4 files included by it."
-      program_details 'autoconf'
+      echo "You should only need it if you modified $configure_deps."
+      ;;
+    autogen*)
+      echo "You should only need it if you modified a '.def' or '.tpl' file."
+      echo "You may want to install the GNU AutoGen package:"
+      echo "<$gnu_software_URL/autogen/>"
       ;;
     autoheader*)
-      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "You should only need it if you modified $autoheader_deps or"
       echo "$configure_deps."
-      program_details 'autoheader'
       ;;
     automake*)
-      echo "You should only need it if you modified 'Makefile.am' or"
-      echo "$configure_deps."
-      program_details 'automake'
-      ;;
-    aclocal*)
-      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "You should only need it if you modified $automake_deps or"
       echo "$configure_deps."
-      program_details 'aclocal'
       ;;
-   autom4te*)
+    autom4te*)
       echo "You might have modified some maintainer files that require"
       echo "the 'autom4te' program to be rebuilt."
-      program_details 'autom4te'
+      ;;
+    autoreconf*)
+      echo "You should only need it if you modified $aclocal_deps or"
+      echo "$automake_deps or $autoheader_deps or $automake_deps or"
+      echo "$configure_deps."
       ;;
     bison*|yacc*)
       echo "You should only need it if you modified a '.y' file."
       echo "You may want to install the GNU Bison package:"
       echo "<$gnu_software_URL/bison/>"
       ;;
-    lex*|flex*)
-      echo "You should only need it if you modified a '.l' file."
-      echo "You may want to install the Fast Lexical Analyzer package:"
-      echo "<$flex_URL>"
-      ;;
     help2man*)
       echo "You should only need it if you modified a dependency" \
            "of a man page."
       echo "You may want to install the GNU Help2man package:"
       echo "<$gnu_software_URL/help2man/>"
     ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
     makeinfo*)
       echo "You should only need it if you modified a '.texi' file, or"
       echo "any other file indirectly affecting the aspect of the manual."
@@ -189,6 +203,12 @@ give_advice ()
       echo "want to install GNU make:"
       echo "<$gnu_software_URL/make/>"
       ;;
+    perl*)
+      echo "You should only need it to run GNU Autoconf, GNU Automake, "
+      echo "  assorted other tools, or if you modified a Perl source file."
+      echo "You may want to install the Perl 5 language interpreter:"
+      echo "<$perl_URL>"
+      ;;
     *)
       echo "You might have modified some files without having the proper"
       echo "tools for further handling them.  Check the 'README' file, it"
@@ -197,6 +217,7 @@ give_advice ()
       echo "case some other package contains this missing '$1' program."
       ;;
   esac
+  program_details "$normalized_program"
 }
 
 give_advice "$1" | sed -e '1s/^/WARNING: /' \
@@ -207,7 +228,7 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \
 exit $st
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp nil t)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"

build_aux/compile

@@ -2,7 +2,7 @@
 #
 # pre-inst-env gnucobol
 #
-# Copyright (C) 2017,2019-2020,2023 Free Software Foundation, Inc.
+# Copyright (C) 2017, 2019-2020, 2023, 2025 Free Software Foundation, Inc.
 # Written by Mathieu Lirzin, Simon Sobisch
 #
 # This file is part of GnuCOBOL.
@@ -25,10 +25,6 @@ PATH="@abs_top_builddir@/cobc:@abs_top_builddir@/bin:${PATH}"
 export PATH
 
 
-# trigger the preference of local instead of installed files
-#GNUCOBOL_UNINSTALLED=1
-#export GNUCOBOL_UNINSTALLED
-
 # let atlocal know that there's less to setup
 GNUCOBOL_ENV_SETUP=1
 export GNUCOBOL_ENV_SETUP
@@ -54,14 +50,7 @@ export COB_CONFIG_DIR COB_COPY_DIR
 export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH
 export COB_LIBRARY_PATH
 
-# ensure we don't execute windows paths within programs generated by cygwin
-# by passing a hint
-if test "$OSTYPE" = "cygwin"; then
-   COB_ON_CYGWIN=1
-   export COB_ON_CYGWIN
-fi
-
-# not robust check, but better than none
+# not robust check, and only works for GNU bash; but much better than none
 if test "x${BASH_SOURCE}" != "x" -a "${BASH_SOURCE}" != "$0"; then
 	echo "This script should not be sourced but called instead!"
 else