ncurses 6.4 - patch 20240420

[ncurses.git] / test / aclocal.m4
diff --git a/test/aclocal.m4 b/test/aclocal.m4

index affadafcde276340bc490cffae07efbaf7bf8465..fdab359ae5f1c6048c116eaf5091d27d0e751594 100644 (file)
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -1,5 +1,5 @@
  dnl***************************************************************************
  dnl***************************************************************************
-dnl Copyright 2018-2019,2020 Thomas E. Dickey                                *
+dnl Copyright 2018-2023,2024 Thomas E. Dickey                                *
  dnl Copyright 2003-2017,2018 Free Software Foundation, Inc.                  *
  dnl                                                                          *
  dnl Permission is hereby granted, free of charge, to any person obtaining a  *
  dnl Copyright 2003-2017,2018 Free Software Foundation, Inc.                  *
  dnl                                                                          *
  dnl Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written       *
  dnl authorization.                                                           *
  dnl***************************************************************************
  dnl
  dnl authorization.                                                           *
  dnl***************************************************************************
  dnl
-dnl $Id: aclocal.m4,v 1.187 2020/11/26 22:37:55 tom Exp $
+dnl $Id: aclocal.m4,v 1.221 2024/01/19 18:27:20 tom Exp $
  dnl
  dnl Author: Thomas E. Dickey
  dnl
  dnl
  dnl Author: Thomas E. Dickey
  dnl
@@ -43,7 +43,7 @@ dnl           https://invisible-island.net/autoconf/my-autoconf.html
  dnl
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
-dnl AM_LANGINFO_CODESET version: 5 updated: 2020/03/10 18:53:47
+dnl AM_LANGINFO_CODESET version: 7 updated: 2023/01/11 04:05:23
  dnl -------------------
  dnl Inserted as requested by gettext 0.10.40
  dnl File from /usr/share/aclocal
  dnl -------------------
  dnl Inserted as requested by gettext 0.10.40
  dnl File from /usr/share/aclocal
@@ -55,12 +55,14 @@ dnl From Bruno Haible.
  AC_DEFUN([AM_LANGINFO_CODESET],
  [
  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
  AC_DEFUN([AM_LANGINFO_CODESET],
  [
  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-       [AC_TRY_LINK([#include <langinfo.h>],
+       [AC_TRY_LINK([
+$ac_includes_default
+#include <langinfo.h>],
         [char* cs = nl_langinfo(CODESET); (void)cs],
         am_cv_langinfo_codeset=yes,
         am_cv_langinfo_codeset=no)
         ])
         [char* cs = nl_langinfo(CODESET); (void)cs],
         am_cv_langinfo_codeset=yes,
         am_cv_langinfo_codeset=no)
         ])
-       if test $am_cv_langinfo_codeset = yes; then
+       if test "$am_cv_langinfo_codeset" = yes; then
                 AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
                 [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
         fi
                 AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
                 [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
         fi
@@ -92,7 +94,7 @@ define([CF_ACVERSION_COMPARE],
  [ifelse([$8], , ,[$8])],
  [ifelse([$9], , ,[$9])])])dnl
  dnl ---------------------------------------------------------------------------
  [ifelse([$8], , ,[$8])],
  [ifelse([$9], , ,[$9])])])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_ADD_CFLAGS version: 14 updated: 2020/04/04 16:16:13
+dnl CF_ADD_CFLAGS version: 15 updated: 2020/12/31 10:54:15
  dnl -------------
  dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
  dnl $1 = flags to add
  dnl -------------
  dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
  dnl $1 = flags to add
@@ -110,19 +112,19 @@ cf_new_extra_cppflags=
  
  for cf_add_cflags in $1
  do
  
  for cf_add_cflags in $1
  do
-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in
  (no)
  (no)
-       case $cf_add_cflags in
+       case "$cf_add_cflags" in
         (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
         (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
-               case $cf_add_cflags in
+               case "$cf_add_cflags" in
                 (-D*)
                 (-D*)
-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'`
  
                         test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                 && test -z "${cf_tst_cflags}" \
                                 && cf_fix_cppflags=yes
  
  
                         test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                 && test -z "${cf_tst_cflags}" \
                                 && cf_fix_cppflags=yes
  
-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then
                                 CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
                                 continue
                         elif test "${cf_tst_cflags}" = "\"'" ; then
                                 CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
                                 continue
                         elif test "${cf_tst_cflags}" = "\"'" ; then
@@ -135,7 +137,7 @@ case $cf_fix_cppflags in
                 (*$cf_add_cflags)
                         ;;
                 (*)
                 (*$cf_add_cflags)
                         ;;
                 (*)
-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in
                         (-D*)
                                 cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
                                 CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
                         (-D*)
                                 cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
                                 CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
@@ -153,7 +155,7 @@ case $cf_fix_cppflags in
  (yes)
         CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
  
  (yes)
         CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
  
-       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
+       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[[^"]]*"'\''//'`
  
         test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                 && test -z "${cf_tst_cflags}" \
  
         test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                 && test -z "${cf_tst_cflags}" \
@@ -181,9 +183,9 @@ AC_SUBST(EXTRA_CPPFLAGS)
  
  ])dnl
  dnl ---------------------------------------------------------------------------
  
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_ADD_INCDIR version: 15 updated: 2018/06/20 20:23:13
+dnl CF_ADD_INCDIR version: 17 updated: 2021/09/04 06:35:04
  dnl -------------
  dnl -------------
-dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
+dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it is
  dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
  dnl but old versions (and some misinstalled ones) need that.  To make things
  dnl worse, gcc 3.x may give error messages if -I/usr/local/include is added to
  dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
  dnl but old versions (and some misinstalled ones) need that.  To make things
  dnl worse, gcc 3.x may give error messages if -I/usr/local/include is added to
@@ -193,9 +195,9 @@ AC_DEFUN([CF_ADD_INCDIR],
  if test -n "$1" ; then
    for cf_add_incdir in $1
    do
  if test -n "$1" ; then
    for cf_add_incdir in $1
    do
-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include
         do
         do
-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"
           then
                 cf_have_incdir=no
                 if test -n "$CFLAGS$CPPFLAGS" ; then
           then
                 cf_have_incdir=no
                 if test -n "$CFLAGS$CPPFLAGS" ; then
@@ -226,7 +228,7 @@ if test -n "$1" ; then
                   CF_VERBOSE(adding $cf_add_incdir to include-path)
                   ifelse([$2],,CPPFLAGS,[$2])="$ifelse([$2],,CPPFLAGS,[$2]) -I$cf_add_incdir"
  
                   CF_VERBOSE(adding $cf_add_incdir to include-path)
                   ifelse([$2],,CPPFLAGS,[$2])="$ifelse([$2],,CPPFLAGS,[$2]) -I$cf_add_incdir"
  
-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`
                   test "$cf_top_incdir" = "$cf_add_incdir" && break
                   cf_add_incdir="$cf_top_incdir"
                 else
                   test "$cf_top_incdir" = "$cf_add_incdir" && break
                   cf_add_incdir="$cf_top_incdir"
                 else
@@ -248,7 +250,7 @@ dnl $1 = library to add, without the "-l"
  dnl $2 = variable to update (default $LIBS)
  AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl
  dnl ---------------------------------------------------------------------------
  dnl $2 = variable to update (default $LIBS)
  AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_ADD_LIBDIR version: 10 updated: 2015/04/18 08:56:57
+dnl CF_ADD_LIBDIR version: 11 updated: 2020/12/31 20:19:42
  dnl -------------
  dnl    Adds to the library-path
  dnl
  dnl -------------
  dnl    Adds to the library-path
  dnl
@@ -262,9 +264,9 @@ AC_DEFUN([CF_ADD_LIBDIR],
  if test -n "$1" ; then
         for cf_add_libdir in $1
         do
  if test -n "$1" ; then
         for cf_add_libdir in $1
         do
-               if test $cf_add_libdir = /usr/lib ; then
+               if test "$cf_add_libdir" = /usr/lib ; then
                         :
                         :
-               elif test -d $cf_add_libdir
+               elif test -d "$cf_add_libdir"
                 then
                         cf_have_libdir=no
                         if test -n "$LDFLAGS$LIBS" ; then
                 then
                         cf_have_libdir=no
                         if test -n "$LDFLAGS$LIBS" ; then
@@ -323,7 +325,7 @@ LIBS=`echo "$LIBS" | sed -e "s/[[   ]][[    ]]*/ /g" -e "s%$1 %$1 $2 %" -e 's%  % %
  CF_VERBOSE(...after  $LIBS)
  ])dnl
  dnl ---------------------------------------------------------------------------
  CF_VERBOSE(...after  $LIBS)
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_ADD_SUBDIR_PATH version: 4 updated: 2013/10/08 17:47:05
+dnl CF_ADD_SUBDIR_PATH version: 5 updated: 2020/12/31 20:19:42
  dnl ------------------
  dnl Append to a search-list for a nonstandard header/lib-file
  dnl    $1 = the variable to return as result
  dnl ------------------
  dnl Append to a search-list for a nonstandard header/lib-file
  dnl    $1 = the variable to return as result
@@ -335,16 +337,35 @@ AC_DEFUN([CF_ADD_SUBDIR_PATH],
  [
  test "x$4" != "x$5" && \
  test -d "$4" && \
  [
  test "x$4" != "x$5" && \
  test -d "$4" && \
-ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]) {
+ifelse([$5],NONE,,[{ test -z "$5" || test "x$5" = xNONE || test "x$4" != "x$5"; } &&]) {
         test -n "$verbose" && echo "    ... testing for $3-directories under $4"
         test -n "$verbose" && echo "    ... testing for $3-directories under $4"
-       test -d $4/$3 &&          $1="[$]$1 $4/$3"
-       test -d $4/$3/$2 &&       $1="[$]$1 $4/$3/$2"
-       test -d $4/$3/$2/$3 &&    $1="[$]$1 $4/$3/$2/$3"
-       test -d $4/$2/$3 &&       $1="[$]$1 $4/$2/$3"
-       test -d $4/$2/$3/$2 &&    $1="[$]$1 $4/$2/$3/$2"
+       test -d "$4/$3" &&          $1="[$]$1 $4/$3"
+       test -d "$4/$3/$2" &&       $1="[$]$1 $4/$3/$2"
+       test -d "$4/$3/$2/$3" &&    $1="[$]$1 $4/$3/$2/$3"
+       test -d "$4/$2/$3" &&       $1="[$]$1 $4/$2/$3"
+       test -d "$4/$2/$3/$2" &&    $1="[$]$1 $4/$2/$3/$2"
  }
  ])dnl
  dnl ---------------------------------------------------------------------------
  }
  ])dnl
  dnl ---------------------------------------------------------------------------
+dnl CF_APPEND_CFLAGS version: 3 updated: 2021/09/05 17:25:40
+dnl ----------------
+dnl Use CF_ADD_CFLAGS after first checking for potential redefinitions.
+dnl $1 = flags to add
+dnl $2 = if given makes this macro verbose.
+define([CF_APPEND_CFLAGS],
+[
+for cf_add_cflags in $1
+do
+       case "x$cf_add_cflags" in
+       (x-[[DU]]*)
+               CF_REMOVE_CFLAGS($cf_add_cflags,CFLAGS,[$2])
+               CF_REMOVE_CFLAGS($cf_add_cflags,CPPFLAGS,[$2])
+               ;;
+       esac
+       CF_ADD_CFLAGS([$cf_add_cflags],[$2])
+done
+])dnl
+dnl ---------------------------------------------------------------------------
  dnl CF_APPEND_TEXT version: 1 updated: 2017/02/25 18:58:55
  dnl --------------
  dnl use this macro for appending text without introducing an extra blank at
  dnl CF_APPEND_TEXT version: 1 updated: 2017/02/25 18:58:55
  dnl --------------
  dnl use this macro for appending text without introducing an extra blank at
@@ -390,7 +411,45 @@ ifelse([$3],,[    :]dnl
  ])dnl
  ])])dnl
  dnl ---------------------------------------------------------------------------
  ])dnl
  ])])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_CC_ENV_FLAGS version: 9 updated: 2018/07/29 18:03:26
+dnl CF_C11_NORETURN version: 4 updated: 2023/02/18 17:41:25
+dnl ---------------
+AC_DEFUN([CF_C11_NORETURN],
+[
+AC_MSG_CHECKING(if you want to use C11 _Noreturn feature)
+CF_ARG_ENABLE(stdnoreturn,
+       [  --enable-stdnoreturn    enable C11 _Noreturn feature for diagnostics],
+       [enable_stdnoreturn=yes],
+       [enable_stdnoreturn=no])
+AC_MSG_RESULT($enable_stdnoreturn)
+
+if test $enable_stdnoreturn = yes; then
+AC_CACHE_CHECK([for C11 _Noreturn feature], cf_cv_c11_noreturn,
+       [AC_TRY_COMPILE([
+$ac_includes_default
+#include <stdnoreturn.h>
+static _Noreturn void giveup(void) { exit(0); }
+       ],
+       [if (feof(stdin)) giveup()],
+       cf_cv_c11_noreturn=yes,
+       cf_cv_c11_noreturn=no)
+       ])
+else
+       cf_cv_c11_noreturn=no,
+fi
+
+if test "$cf_cv_c11_noreturn" = yes; then
+       AC_DEFINE(HAVE_STDNORETURN_H, 1,[Define if <stdnoreturn.h> header is available and working])
+       AC_DEFINE_UNQUOTED(STDC_NORETURN,_Noreturn,[Define if C11 _Noreturn keyword is supported])
+       HAVE_STDNORETURN_H=1
+else
+       HAVE_STDNORETURN_H=0
+fi
+
+AC_SUBST(HAVE_STDNORETURN_H)
+AC_SUBST(STDC_NORETURN)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CC_ENV_FLAGS version: 11 updated: 2023/02/20 11:15:46
  dnl ---------------
  dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
  dnl into CC.  This will not help with broken scripts that wrap the compiler
  dnl ---------------
  dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
  dnl into CC.  This will not help with broken scripts that wrap the compiler
@@ -405,7 +464,7 @@ dnl outweighs that limitation.
  AC_DEFUN([CF_CC_ENV_FLAGS],
  [
  # This should have been defined by AC_PROG_CC
  AC_DEFUN([CF_CC_ENV_FLAGS],
  [
  # This should have been defined by AC_PROG_CC
-: ${CC:=cc}
+: "${CC:=cc}"
  
  AC_MSG_CHECKING(\$CFLAGS variable)
  case "x$CFLAGS" in
  
  AC_MSG_CHECKING(\$CFLAGS variable)
  case "x$CFLAGS" in
@@ -431,7 +490,7 @@ case "$CC" in
         AC_MSG_WARN(your environment uses the CC variable to hold CFLAGS/CPPFLAGS options)
         # humor him...
         cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
         AC_MSG_WARN(your environment uses the CC variable to hold CFLAGS/CPPFLAGS options)
         # humor him...
         cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
-       cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", [substr]([$]0,1+length(prog))); }'`
+       cf_flags=`echo "$CC" | sed -e "s%^$cf_prog%%"`
         CC="$cf_prog"
         for cf_arg in $cf_flags
         do
         CC="$cf_prog"
         for cf_arg in $cf_flags
         do
@@ -454,7 +513,7 @@ case "$CC" in
  esac
  ])dnl
  dnl ---------------------------------------------------------------------------
  esac
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_CACHE version: 12 updated: 2012/10/02 20:55:03
+dnl CF_CHECK_CACHE version: 13 updated: 2020/12/31 10:54:15
  dnl --------------
  dnl Check if we're accidentally using a cache from a different machine.
  dnl Derive the system name, as a check for reusing the autoconf cache.
  dnl --------------
  dnl Check if we're accidentally using a cache from a different machine.
  dnl Derive the system name, as a check for reusing the autoconf cache.
@@ -468,7 +527,7 @@ dnl Note: we would use $ac_config_sub, but that is one of the places where
  dnl autoconf 2.5x broke compatibility with autoconf 2.13
  AC_DEFUN([CF_CHECK_CACHE],
  [
  dnl autoconf 2.5x broke compatibility with autoconf 2.13
  AC_DEFUN([CF_CHECK_CACHE],
  [
-if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
+if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
         ifelse([$1],,[AC_CANONICAL_HOST],[$1])
         system_name="$host_os"
  else
         ifelse([$1],,[AC_CANONICAL_HOST],[$1])
         system_name="$host_os"
  else
@@ -489,7 +548,7 @@ if test ".$system_name" != ".$cf_cv_system_name" ; then
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_CFLAGS version: 3 updated: 2014/07/22 05:32:57
+dnl CF_CHECK_CFLAGS version: 4 updated: 2021/01/02 19:22:58
  dnl ---------------
  dnl Conditionally add to $CFLAGS and $CPPFLAGS values which are derived from
  dnl a build-configuration such as imake.  These have the pitfall that they
  dnl ---------------
  dnl Conditionally add to $CFLAGS and $CPPFLAGS values which are derived from
  dnl a build-configuration such as imake.  These have the pitfall that they
@@ -507,11 +566,11 @@ AC_TRY_LINK([#include <stdio.h>],[printf("Hello world");],,
          if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
                  CF_VERBOSE(but keeping change to \$CPPFLAGS)
          fi
          if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
                  CF_VERBOSE(but keeping change to \$CPPFLAGS)
          fi
-        CFLAGS="$cf_check_flags"])
+        CFLAGS="$cf_check_cflags"])
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_CURSES_LIB version: 2 updated: 2018/01/03 04:47:33
+dnl CF_CHECK_CURSES_LIB version: 4 updated: 2021/09/05 17:25:40
  dnl -------------------
  dnl $1 = nominal library name, used also for header lookup
  dnl $2 = suffix to append to library name
  dnl -------------------
  dnl $1 = nominal library name, used also for header lookup
  dnl $2 = suffix to append to library name
@@ -528,16 +587,17 @@ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
         :
  elif test "x${PKG_CONFIG:=none}" != xnone; then
         AC_MSG_CHECKING(pkg-config for $1$2)
         :
  elif test "x${PKG_CONFIG:=none}" != xnone; then
         AC_MSG_CHECKING(pkg-config for $1$2)
-       if "$PKG_CONFIG" --exists $1$2 ; then
+       if "$PKG_CONFIG" --exists "$1$2" ; then
                 AC_MSG_RESULT(yes)
  
                 AC_MSG_CHECKING(if the $1$2 package files work)
  
                 AC_MSG_RESULT(yes)
  
                 AC_MSG_CHECKING(if the $1$2 package files work)
  
+               cf_save_CFLAGS="$CFLAGS"
                 cf_save_CPPFLAGS="$CPPFLAGS"
                 cf_save_LIBS="$LIBS"
  
                 cf_save_CPPFLAGS="$CPPFLAGS"
                 cf_save_LIBS="$LIBS"
  
-               CF_ADD_CFLAGS(`$PKG_CONFIG --cflags $1$2`)
-               CF_ADD_LIBS(`$PKG_CONFIG --libs $1$2`)
+               CF_APPEND_CFLAGS(`$PKG_CONFIG --cflags "$1$2"`)
+               CF_ADD_LIBS(`$PKG_CONFIG --libs "$1$2"`)
  
                 AC_TRY_LINK([#include <$1.h>],
                         [(void) $3 ( ]ifelse([$4],,,[[$4]])[ );],
  
                 AC_TRY_LINK([#include <$1.h>],
                         [(void) $3 ( ]ifelse([$4],,,[[$4]])[ );],
@@ -550,13 +610,14 @@ elif test "x${PKG_CONFIG:=none}" != xnone; then
                         [cf_have_curses_lib=no])
                 AC_MSG_RESULT($cf_have_curses_lib)
                 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
                         [cf_have_curses_lib=no])
                 AC_MSG_RESULT($cf_have_curses_lib)
                 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
-               if test "$cf_have_curses_lib" != "yes"
+               if test "$cf_have_curses_lib" = "yes"
                 then
                 then
-                       CPPFLAGS="$cf_save_CPPFLAGS"
-                       LIBS="$cf_save_LIBS"
-               else
                         CF_UPPER(cf_upper,have_lib$1)
                         AC_DEFINE_UNQUOTED($cf_upper,1)
                         CF_UPPER(cf_upper,have_lib$1)
                         AC_DEFINE_UNQUOTED($cf_upper,1)
+               else
+                       CFLAGS="$cf_save_CFLAGS"
+                       CPPFLAGS="$cf_save_CPPFLAGS"
+                       LIBS="$cf_save_LIBS"
                 fi
         fi
  fi
                 fi
         fi
  fi
@@ -568,7 +629,7 @@ if test "$cf_have_curses_lib" = no; then
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_CLANG_COMPILER version: 6 updated: 2020/11/26 17:37:55
+dnl CF_CLANG_COMPILER version: 9 updated: 2023/02/18 17:41:25
  dnl -----------------
  dnl Check if the given compiler is really clang.  clang's C driver defines
  dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
  dnl -----------------
  dnl Check if the given compiler is really clang.  clang's C driver defines
  dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
@@ -590,7 +651,7 @@ if test "$ifelse([$1],,[$1],GCC)" = yes ; then
         AC_TRY_COMPILE([],[
  #ifdef __clang__
  #else
         AC_TRY_COMPILE([],[
  #ifdef __clang__
  #else
-make an error
+#error __clang__ is not defined
  #endif
  ],[ifelse([$2],,CLANG_COMPILER,[$2])=yes
  ],[])
  #endif
  ],[ifelse([$2],,CLANG_COMPILER,[$2])=yes
  ],[])
@@ -623,12 +684,12 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
                 CFLAGS="$CFLAGS $cf_clang_opt"
                 AC_TRY_LINK([
                         #include <stdio.h>],[
                 CFLAGS="$CFLAGS $cf_clang_opt"
                 AC_TRY_LINK([
                         #include <stdio.h>],[
-                       printf("hello!\n");],[
+                       printf("hello!\\n");],[
                         cf_clang_optok=yes],[
                         cf_clang_optok=no])
                 AC_MSG_RESULT($cf_clang_optok)
                 CFLAGS="$cf_save_CFLAGS"
                         cf_clang_optok=yes],[
                         cf_clang_optok=no])
                 AC_MSG_RESULT($cf_clang_optok)
                 CFLAGS="$cf_save_CFLAGS"
-               if test $cf_clang_optok = yes; then
+               if test "$cf_clang_optok" = yes; then
                         CF_VERBOSE(adding option $cf_clang_opt)
                         CF_APPEND_TEXT(CFLAGS,$cf_clang_opt)
                 fi
                         CF_VERBOSE(adding option $cf_clang_opt)
                         CF_APPEND_TEXT(CFLAGS,$cf_clang_opt)
                 fi
@@ -636,7 +697,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
  fi
  ])
  dnl ---------------------------------------------------------------------------
  fi
  ])
  dnl ---------------------------------------------------------------------------
-dnl CF_CONST_X_STRING version: 4 updated: 2020/03/10 18:53:47
+dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50
  dnl -----------------
  dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
  dnl character-strings.
  dnl -----------------
  dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
  dnl character-strings.
@@ -648,7 +709,7 @@ dnl did not take into account the use of const for telling the compiler that
  dnl string literals would be in readonly memory.
  dnl
  dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to
  dnl string literals would be in readonly memory.
  dnl
  dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to
-dnl let the compiler decide how to represent Xt's strings which were #define'd. 
+dnl let the compiler decide how to represent Xt's strings which were #define'd.
  dnl That does not solve the problem of using the block of Xt's strings which
  dnl are compiled into the library (and is less efficient than one might want).
  dnl
  dnl That does not solve the problem of using the block of Xt's strings which
  dnl are compiled into the library (and is less efficient than one might want).
  dnl
@@ -666,11 +727,12 @@ AC_TRY_COMPILE(
  #include <stdlib.h>
  #include <X11/Intrinsic.h>
  ],
  #include <stdlib.h>
  #include <X11/Intrinsic.h>
  ],
-[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(
                 [
  
  AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
         AC_TRY_COMPILE(
                 [
+#undef  _CONST_X_STRING
  #define _CONST_X_STRING        /* X11R7.8 (perhaps) */
  #undef  XTSTRINGDEFINES        /* X11R5 and later */
  #include <stdlib.h>
  #define _CONST_X_STRING        /* X11R7.8 (perhaps) */
  #undef  XTSTRINGDEFINES        /* X11R5 and later */
  #include <stdlib.h>
@@ -684,7 +746,7 @@ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
  
  CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING])
  
  
  CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING])
  
-case $cf_cv_const_x_string in
+case "$cf_cv_const_x_string" in
  (no)
         CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
         ;;
  (no)
         CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
         ;;
@@ -696,7 +758,7 @@ esac
  ])
  ])dnl
  dnl ---------------------------------------------------------------------------
  ])
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_ACS_MAP version: 7 updated: 2012/10/06 16:39:58
+dnl CF_CURSES_ACS_MAP version: 8 updated: 2021/01/04 19:45:09
  dnl -----------------
  dnl Check for likely values of acs_map[]:
  AC_DEFUN([CF_CURSES_ACS_MAP],
  dnl -----------------
  dnl Check for likely values of acs_map[]:
  AC_DEFUN([CF_CURSES_ACS_MAP],
@@ -709,7 +771,7 @@ do
  AC_TRY_LINK([
  #include <${cf_cv_ncurses_header:-curses.h}>
  ],[
  AC_TRY_LINK([
  #include <${cf_cv_ncurses_header:-curses.h}>
  ],[
-$name['k'] = ACS_PLUS
+${name}['k'] = ACS_PLUS
  ],[cf_cv_curses_acs_map=$name; break])
  done
  ])
  ],[cf_cv_curses_acs_map=$name; break])
  done
  ])
@@ -717,7 +779,7 @@ done
  test "$cf_cv_curses_acs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_ACS_ARRAY,$cf_cv_curses_acs_map,[Define as needed to override ncurses prefix _nc_])
  ])
  dnl ---------------------------------------------------------------------------
  test "$cf_cv_curses_acs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_ACS_ARRAY,$cf_cv_curses_acs_map,[Define as needed to override ncurses prefix _nc_])
  ])
  dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_CHECK_DATA version: 9 updated: 2020/02/08 21:00:26
+dnl CF_CURSES_CHECK_DATA version: 10 updated: 2021/01/04 19:45:09
  dnl --------------------
  dnl Check if curses.h defines the given data/variable.
  dnl Use this after CF_NCURSES_CONFIG or CF_CURSES_CONFIG.
  dnl --------------------
  dnl Check if curses.h defines the given data/variable.
  dnl Use this after CF_NCURSES_CONFIG or CF_CURSES_CONFIG.
@@ -736,7 +798,7 @@ CF__CURSES_DATA(foo,$cf_data)
  ],[cf_result=no])
  AC_MSG_RESULT($cf_result)
  
  ],[cf_result=no])
  AC_MSG_RESULT($cf_result)
  
-if test $cf_result = yes ; then
+if test "$cf_result" = yes ; then
         CF_UPPER(cf_result,have_curses_data_$cf_data)
         AC_DEFINE_UNQUOTED($cf_result)
         ifelse($2,,,[$2])
         CF_UPPER(cf_result,have_curses_data_$cf_data)
         AC_DEFINE_UNQUOTED($cf_result)
         ifelse($2,,,[$2])
@@ -762,7 +824,7 @@ int main(void)
  ],[cf_result=yes],[cf_result=no])
  ])
         AC_MSG_RESULT($cf_result)
  ],[cf_result=yes],[cf_result=no])
  ])
         AC_MSG_RESULT($cf_result)
-       if test $cf_result = yes ; then
+       if test "$cf_result" = yes ; then
                 CF_UPPER(cf_result,decl_curses_data_$cf_data)
                 AC_DEFINE_UNQUOTED($cf_result)
                 # do not exit loop here, since we prefer system's declarations
                 CF_UPPER(cf_result,decl_curses_data_$cf_data)
                 AC_DEFINE_UNQUOTED($cf_result)
                 # do not exit loop here, since we prefer system's declarations
@@ -771,7 +833,7 @@ fi
  done
  ])dnl
  dnl ---------------------------------------------------------------------------
  done
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_CHECK_TYPE version: 4 updated: 2012/10/06 16:39:58
+dnl CF_CURSES_CHECK_TYPE version: 5 updated: 2021/01/04 19:45:09
  dnl --------------------
  dnl Check if curses.h defines the given type
  AC_DEFUN([CF_CURSES_CHECK_TYPE],
  dnl --------------------
  dnl Check if curses.h defines the given type
  AC_DEFUN([CF_CURSES_CHECK_TYPE],
@@ -785,7 +847,7 @@ AC_TRY_COMPILE([
  $1 foo
  ],cf_result=yes,cf_result=no)
  AC_MSG_RESULT($cf_result)
  $1 foo
  ],cf_result=yes,cf_result=no)
  AC_MSG_RESULT($cf_result)
-if test $cf_result = yes ; then
+if test "$cf_result" = yes ; then
         CF_UPPER(cf_result,have_type_$1)
         AC_DEFINE_UNQUOTED($cf_result,1,[Define to 1 if we have type $1])
  else
         CF_UPPER(cf_result,have_type_$1)
         AC_DEFINE_UNQUOTED($cf_result,1,[Define to 1 if we have type $1])
  else
@@ -805,14 +867,14 @@ CF_NCURSES_VERSION
  CF_CURSES_LIBS
  ])dnl
  dnl ---------------------------------------------------------------------------
  CF_CURSES_LIBS
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_CPPFLAGS version: 13 updated: 2018/06/20 20:23:13
+dnl CF_CURSES_CPPFLAGS version: 14 updated: 2021/01/02 09:31:20
  dnl ------------------
  dnl Look for the curses headers.
  AC_DEFUN([CF_CURSES_CPPFLAGS],[
  
  AC_CACHE_CHECK(for extra include directories,cf_cv_curses_incdir,[
  cf_cv_curses_incdir=no
  dnl ------------------
  dnl Look for the curses headers.
  AC_DEFUN([CF_CURSES_CPPFLAGS],[
  
  AC_CACHE_CHECK(for extra include directories,cf_cv_curses_incdir,[
  cf_cv_curses_incdir=no
-case $host_os in
+case "$host_os" in
  (hpux10.*)
         if test "x$cf_cv_screen" = "xcurses_colr"
         then
  (hpux10.*)
         if test "x$cf_cv_screen" = "xcurses_colr"
         then
@@ -839,7 +901,7 @@ CF_CURSES_HEADER
  CF_TERM_HEADER
  ])dnl
  dnl ---------------------------------------------------------------------------
  CF_TERM_HEADER
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_FUNCS version: 19 updated: 2018/01/03 04:47:33
+dnl CF_CURSES_FUNCS version: 20 updated: 2020/12/31 20:19:42
  dnl ---------------
  dnl Curses-functions are a little complicated, since a lot of them are macros.
  AC_DEFUN([CF_CURSES_FUNCS],
  dnl ---------------
  dnl Curses-functions are a little complicated, since a lot of them are macros.
  AC_DEFUN([CF_CURSES_FUNCS],
@@ -860,7 +922,7 @@ do
                         [
  #ifndef ${cf_func}
  long foo = (long)(&${cf_func});
                         [
  #ifndef ${cf_func}
  long foo = (long)(&${cf_func});
-fprintf(stderr, "testing linkage of $cf_func:%p\n", (void *)foo);
+fprintf(stderr, "testing linkage of $cf_func:%p\\n", (void *)foo);
  if (foo + 1234L > 5678L)
         ${cf_cv_main_return:-return}(foo != 0);
  #endif
  if (foo + 1234L > 5678L)
         ${cf_cv_main_return:-return}(foo != 0);
  #endif
@@ -868,18 +930,18 @@ if (foo + 1234L > 5678L)
                         [cf_result=yes],
                         [cf_result=no])
                 fi
                         [cf_result=yes],
                         [cf_result=no])
                 fi
-               eval 'cf_cv_func_'$cf_func'=$cf_result'
+               eval 'cf_cv_func_'$cf_func'="$cf_result"'
         ])
         # use the computed/retrieved cache-value:
         eval 'cf_result=$cf_cv_func_'$cf_func
         AC_MSG_RESULT($cf_result)
         ])
         # use the computed/retrieved cache-value:
         eval 'cf_result=$cf_cv_func_'$cf_func
         AC_MSG_RESULT($cf_result)
-       if test $cf_result != no; then
+       if test "$cf_result" != no; then
                 AC_DEFINE_UNQUOTED(HAVE_${cf_tr_func})
         fi
  done
  ])dnl
  dnl ---------------------------------------------------------------------------
                 AC_DEFINE_UNQUOTED(HAVE_${cf_tr_func})
         fi
  done
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_HEADER version: 5 updated: 2015/04/23 20:35:30
+dnl CF_CURSES_HEADER version: 6 updated: 2022/12/02 20:06:52
  dnl ----------------
  dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
  dnl variations of ncurses' installs.
  dnl ----------------
  dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
  dnl variations of ncurses' installs.
@@ -893,7 +955,7 @@ for cf_header in \
         curses.h ifelse($1,,,[$1/curses.h]) ifelse($1,,[ncurses/ncurses.h ncurses/curses.h])
  do
  AC_TRY_COMPILE([#include <${cf_header}>],
         curses.h ifelse($1,,,[$1/curses.h]) ifelse($1,,[ncurses/ncurses.h ncurses/curses.h])
  do
  AC_TRY_COMPILE([#include <${cf_header}>],
-       [initscr(); tgoto("?", 0,0)],
+       [initscr(); endwin()],
         [cf_cv_ncurses_header=$cf_header; break],[])
  done
  ])
         [cf_cv_ncurses_header=$cf_header; break],[])
  done
  ])
@@ -906,7 +968,7 @@ fi
  AC_CHECK_HEADERS($cf_cv_ncurses_header)
  ])dnl
  dnl ---------------------------------------------------------------------------
  AC_CHECK_HEADERS($cf_cv_ncurses_header)
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_LIBS version: 42 updated: 2018/06/20 20:23:13
+dnl CF_CURSES_LIBS version: 45 updated: 2022/12/02 20:06:52
  dnl --------------
  dnl Look for the curses libraries.  Older curses implementations may require
  dnl termcap/termlib to be linked as well.  Call CF_CURSES_CPPFLAGS first.
  dnl --------------
  dnl Look for the curses libraries.  Older curses implementations may require
  dnl termcap/termlib to be linked as well.  Call CF_CURSES_CPPFLAGS first.
@@ -915,13 +977,13 @@ AC_DEFUN([CF_CURSES_LIBS],[
  AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
  AC_MSG_CHECKING(if we have identified curses libraries)
  AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
  AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
  AC_MSG_CHECKING(if we have identified curses libraries)
  AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
-       [initscr(); tgoto("?", 0,0)],
+       [initscr(); endwin()],
         cf_result=yes,
         cf_result=no)
  AC_MSG_RESULT($cf_result)
  
  if test "$cf_result" = no ; then
         cf_result=yes,
         cf_result=no)
  AC_MSG_RESULT($cf_result)
  
  if test "$cf_result" = no ; then
-case $host_os in
+case "$host_os" in
  (freebsd*)
         AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)])
         ;;
  (freebsd*)
         AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)])
         ;;
@@ -989,7 +1051,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then
                         for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
                         do
                                 AC_CHECK_LIB($cf_term_lib,tgoto,[
                         for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
                         do
                                 AC_CHECK_LIB($cf_term_lib,tgoto,[
-                                       : ${cf_nculib_root:=$cf_term_lib}
+                                       : "${cf_nculib_root:=$cf_term_lib}"
                                         break
                                 ])
                         done
                                         break
                                 ])
                         done
@@ -1010,13 +1072,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
                                         [cf_result=yes],
                                         [cf_result=no])
                                 AC_MSG_RESULT($cf_result)
                                         [cf_result=yes],
                                         [cf_result=no])
                                 AC_MSG_RESULT($cf_result)
-                               test $cf_result = yes && break
+                               test "$cf_result" = yes && break
                         elif test "$cf_curs_lib" = "$cf_term_lib" ; then
                                 cf_result=no
                         elif test "$cf_term_lib" != predefined ; then
                                 AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries)
                                 AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
                         elif test "$cf_curs_lib" = "$cf_term_lib" ; then
                                 cf_result=no
                         elif test "$cf_term_lib" != predefined ; then
                                 AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries)
                                 AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
-                                       [initscr(); tgoto((char *)0, 0, 0);],
+                                       [initscr(); endwin();],
                                         [cf_result=no],
                                         [
                                         LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
                                         [cf_result=no],
                                         [
                                         LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
@@ -1026,17 +1088,17 @@ if test ".$ac_cv_func_initscr" != .yes ; then
                                                 [cf_result=error])
                                         ])
                                 AC_MSG_RESULT($cf_result)
                                                 [cf_result=error])
                                         ])
                                 AC_MSG_RESULT($cf_result)
-                               test $cf_result != error && break
+                               test "$cf_result" != error && break
                         fi
                 done
         fi
                         fi
                 done
         fi
-       test $cf_curs_lib = unknown && AC_MSG_ERROR(no curses library found)
+       test "$cf_curs_lib" = unknown && AC_MSG_ERROR(no curses library found)
  fi
  fi
  
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  fi
  
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_TERM_H version: 12 updated: 2020/03/19 20:23:48
+dnl CF_CURSES_TERM_H version: 16 updated: 2024/01/07 06:34:16
  dnl ----------------
  dnl SVr4 curses should have term.h as well (where it puts the definitions of
  dnl the low-level interface).  This may not be true in old/broken implementations,
  dnl ----------------
  dnl SVr4 curses should have term.h as well (where it puts the definitions of
  dnl the low-level interface).  This may not be true in old/broken implementations,
@@ -1053,9 +1115,9 @@ AC_CACHE_CHECK(for term.h, cf_cv_term_header,[
  
  cf_header_list="term.h ncurses/term.h ncursesw/term.h"
  
  
  cf_header_list="term.h ncurses/term.h ncursesw/term.h"
  
-case ${cf_cv_ncurses_header:-curses.h} in
+case "${cf_cv_ncurses_header:-curses.h}" in
  (*/*)
  (*/*)
-       cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h
+       cf_header_item=`echo "${cf_cv_ncurses_header:-curses.h}" | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h
         cf_header_list="$cf_header_item $cf_header_list"
         ;;
  esac
         cf_header_list="$cf_header_item $cf_header_list"
         ;;
  esac
@@ -1071,7 +1133,7 @@ do
         [cf_cv_term_header=no])
  done
  
         [cf_cv_term_header=no])
  done
  
-case $cf_cv_term_header in
+case "$cf_cv_term_header" in
  (no)
         # If curses is ncurses, some packagers still mess it up by trying to make
         # us use GNU termcap.  This handles the most common case.
  (no)
         # If curses is ncurses, some packagers still mess it up by trying to make
         # us use GNU termcap.  This handles the most common case.
@@ -1082,7 +1144,7 @@ case $cf_cv_term_header in
  #ifdef NCURSES_VERSION
  #include <${cf_header}>
  #else
  #ifdef NCURSES_VERSION
  #include <${cf_header}>
  #else
-make an error
+#error expected NCURSES_VERSION to be defined
  #endif],
                         [WINDOW *x; (void)x],
                         [cf_cv_term_header=$cf_header
  #endif],
                         [WINDOW *x; (void)x],
                         [cf_cv_term_header=$cf_header
@@ -1093,7 +1155,7 @@ make an error
  esac
  ])
  
  esac
  ])
  
-case $cf_cv_term_header in
+case "$cf_cv_term_header" in
  (term.h)
         AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h])
         ;;
  (term.h)
         AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h])
         ;;
@@ -1106,7 +1168,7 @@ case $cf_cv_term_header in
  esac
  ])dnl
  dnl ---------------------------------------------------------------------------
  esac
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_UNCTRL_H version: 5 updated: 2020/03/19 20:23:48
+dnl CF_CURSES_UNCTRL_H version: 8 updated: 2021/01/02 09:31:20
  dnl ------------------
  dnl Any X/Open curses implementation must have unctrl.h, but ncurses packages
  dnl may put it in a subdirectory (along with ncurses' other headers, of
  dnl ------------------
  dnl Any X/Open curses implementation must have unctrl.h, but ncurses packages
  dnl may put it in a subdirectory (along with ncurses' other headers, of
@@ -1123,9 +1185,9 @@ AC_CACHE_CHECK(for unctrl.h, cf_cv_unctrl_header,[
  
  cf_header_list="unctrl.h ncurses/unctrl.h ncursesw/unctrl.h"
  
  
  cf_header_list="unctrl.h ncurses/unctrl.h ncursesw/unctrl.h"
  
-case ${cf_cv_ncurses_header:-curses.h} in
+case "${cf_cv_ncurses_header:-curses.h}" in
  (*/*)
  (*/*)
-       cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h
+       cf_header_item=`echo "${cf_cv_ncurses_header:-curses.h}" | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h
         cf_header_list="$cf_header_item $cf_header_list"
         ;;
  esac
         cf_header_list="$cf_header_item $cf_header_list"
         ;;
  esac
@@ -1142,13 +1204,13 @@ do
  done
  ])
  
  done
  ])
  
-case $cf_cv_unctrl_header in
+case "$cf_cv_unctrl_header" in
  (no)
         AC_MSG_WARN(unctrl.h header not found)
         ;;
  esac
  
  (no)
         AC_MSG_WARN(unctrl.h header not found)
         ;;
  esac
  
-case $cf_cv_unctrl_header in
+case "$cf_cv_unctrl_header" in
  (unctrl.h)
         AC_DEFINE(HAVE_UNCTRL_H,1,[Define to 1 if we have unctrl.h])
         ;;
  (unctrl.h)
         AC_DEFINE(HAVE_UNCTRL_H,1,[Define to 1 if we have unctrl.h])
         ;;
@@ -1161,7 +1223,7 @@ case $cf_cv_unctrl_header in
  esac
  ])dnl
  dnl ---------------------------------------------------------------------------
  esac
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_WACS_MAP version: 7 updated: 2020/03/19 20:23:48
+dnl CF_CURSES_WACS_MAP version: 8 updated: 2021/01/04 19:45:09
  dnl ------------------
  dnl Check for likely values of wacs_map[].
  AC_DEFUN([CF_CURSES_WACS_MAP],
  dnl ------------------
  dnl Check for likely values of wacs_map[].
  AC_DEFUN([CF_CURSES_WACS_MAP],
@@ -1175,7 +1237,7 @@ AC_CACHE_CHECK(for wide alternate character set array, cf_cv_curses_wacs_map,[
  #define _XOPEN_SOURCE_EXTENDED
  #endif
  #include <${cf_cv_ncurses_header:-curses.h}>],
  #define _XOPEN_SOURCE_EXTENDED
  #endif
  #include <${cf_cv_ncurses_header:-curses.h}>],
-       [void *foo = &($name['k']); (void)foo],
+       [void *foo = &(${name}['k']); (void)foo],
         [cf_cv_curses_wacs_map=$name
          break])
         done])
         [cf_cv_curses_wacs_map=$name
          break])
         done])
@@ -1183,7 +1245,7 @@ AC_CACHE_CHECK(for wide alternate character set array, cf_cv_curses_wacs_map,[
  test "$cf_cv_curses_wacs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_WACS_ARRAY,$cf_cv_curses_wacs_map,[Define to name of (n)curses wide-character array])
  ])dnl
  dnl ---------------------------------------------------------------------------
  test "$cf_cv_curses_wacs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_WACS_ARRAY,$cf_cv_curses_wacs_map,[Define to name of (n)curses wide-character array])
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_WACS_SYMBOLS version: 3 updated: 2020/03/19 20:23:48
+dnl CF_CURSES_WACS_SYMBOLS version: 4 updated: 2021/01/04 19:45:09
  dnl ----------------------
  dnl Do a check to see if the WACS_xxx constants are defined compatibly with
  dnl X/Open Curses.  In particular, NetBSD's implementation of the WACS_xxx
  dnl ----------------------
  dnl Do a check to see if the WACS_xxx constants are defined compatibly with
  dnl X/Open Curses.  In particular, NetBSD's implementation of the WACS_xxx
@@ -1202,7 +1264,7 @@ then
  #endif
  #include <${cf_cv_ncurses_header:-curses.h}>],
         [cchar_t *foo = WACS_PLUS;
  #endif
  #include <${cf_cv_ncurses_header:-curses.h}>],
         [cchar_t *foo = WACS_PLUS;
-        $cf_cv_curses_wacs_map['k'] = *WACS_PLUS; (void)foo],
+        ${cf_cv_curses_wacs_map}['k'] = *WACS_PLUS; (void)foo],
         [cf_cv_curses_wacs_symbols=yes])
  else
         AC_TRY_LINK([
         [cf_cv_curses_wacs_symbols=yes])
  else
         AC_TRY_LINK([
@@ -1218,14 +1280,14 @@ fi
  test "$cf_cv_curses_wacs_symbols" != no && AC_DEFINE(CURSES_WACS_SYMBOLS,1,[Define to 1 if (n)curses supports wide-character WACS_ symbols])
  ])dnl
  dnl ---------------------------------------------------------------------------
  test "$cf_cv_curses_wacs_symbols" != no && AC_DEFINE(CURSES_WACS_SYMBOLS,1,[Define to 1 if (n)curses supports wide-character WACS_ symbols])
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52
+dnl CF_DIRNAME version: 5 updated: 2020/12/31 20:19:42
  dnl ----------
  dnl "dirname" is not portable, so we fake it with a shell script.
  dnl ----------
  dnl "dirname" is not portable, so we fake it with a shell script.
-AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
+AC_DEFUN([CF_DIRNAME],[$1=`echo "$2" | sed -e 's%/[[^/]]*$%%'`])dnl
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_ECHO version: 13 updated: 2015/04/18 08:56:57
+dnl CF_DISABLE_ECHO version: 14 updated: 2021/09/04 06:35:04
  dnl ---------------
  dnl ---------------
-dnl You can always use "make -n" to see the actual options, but it's hard to
+dnl You can always use "make -n" to see the actual options, but it is hard to
  dnl pick out/analyze warning messages when the compile-line is long.
  dnl
  dnl Sets:
  dnl pick out/analyze warning messages when the compile-line is long.
  dnl
  dnl Sets:
@@ -1260,7 +1322,7 @@ AC_SUBST(SHOW_CC)
  AC_SUBST(ECHO_CC)
  ])dnl
  dnl ---------------------------------------------------------------------------
  AC_SUBST(ECHO_CC)
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_LEAKS version: 7 updated: 2012/10/02 20:55:03
+dnl CF_DISABLE_LEAKS version: 9 updated: 2021/04/03 16:41:50
  dnl ----------------
  dnl Combine no-leak checks with the libraries or tools that are used for the
  dnl checks.
  dnl ----------------
  dnl Combine no-leak checks with the libraries or tools that are used for the
  dnl checks.
@@ -1273,17 +1335,19 @@ AC_REQUIRE([CF_WITH_VALGRIND])
  AC_MSG_CHECKING(if you want to perform memory-leak testing)
  AC_ARG_ENABLE(leaks,
         [  --disable-leaks         test: free permanent memory, analyze leaks],
  AC_MSG_CHECKING(if you want to perform memory-leak testing)
  AC_ARG_ENABLE(leaks,
         [  --disable-leaks         test: free permanent memory, analyze leaks],
-       [if test "x$enableval" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi],
-       : ${with_no_leaks:=no})
+       [enable_leaks=$enableval],
+       [enable_leaks=yes])
+dnl with_no_leaks is more readable...
+if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
  AC_MSG_RESULT($with_no_leaks)
  
  AC_MSG_RESULT($with_no_leaks)
  
-if test "$with_no_leaks" = yes ; then
+if test "$enable_leaks" = no ; then
         AC_DEFINE(NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
         AC_DEFINE(YY_NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
         AC_DEFINE(NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
         AC_DEFINE(YY_NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_RPATH_HACK version: 2 updated: 2011/02/13 13:31:33
+dnl CF_DISABLE_RPATH_HACK version: 3 updated: 2021/01/05 20:14:44
  dnl ---------------------
  dnl The rpath-hack makes it simpler to build programs, particularly with the
  dnl *BSD ports which may have essential libraries in unusual places.  But it
  dnl ---------------------
  dnl The rpath-hack makes it simpler to build programs, particularly with the
  dnl *BSD ports which may have essential libraries in unusual places.  But it
@@ -1294,15 +1358,18 @@ AC_DEFUN([CF_DISABLE_RPATH_HACK],
  AC_MSG_CHECKING(if rpath-hack should be disabled)
  CF_ARG_DISABLE(rpath-hack,
         [  --disable-rpath-hack    don't add rpath options for additional libraries],
  AC_MSG_CHECKING(if rpath-hack should be disabled)
  CF_ARG_DISABLE(rpath-hack,
         [  --disable-rpath-hack    don't add rpath options for additional libraries],
-       [cf_disable_rpath_hack=yes],
-       [cf_disable_rpath_hack=no])
+       [enable_rpath_hack=no],
+       [enable_rpath_hack=yes])
+dnl TODO - drop cf_disable_rpath_hack
+if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
  AC_MSG_RESULT($cf_disable_rpath_hack)
  AC_MSG_RESULT($cf_disable_rpath_hack)
-if test "$cf_disable_rpath_hack" = no ; then
+
+if test "$enable_rpath_hack" = yes ; then
         CF_RPATH_HACK
  fi
  ])
  dnl ---------------------------------------------------------------------------
         CF_RPATH_HACK
  fi
  ])
  dnl ---------------------------------------------------------------------------
-dnl CF_ENABLE_STRING_HACKS version: 5 updated: 2016/10/08 17:34:11
+dnl CF_ENABLE_STRING_HACKS version: 6 updated: 2021/01/05 19:23:48
  dnl ----------------------
  dnl On a few platforms, the compiler and/or loader nags with untruthful
  dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect,
  dnl ----------------------
  dnl On a few platforms, the compiler and/or loader nags with untruthful
  dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect,
@@ -1322,11 +1389,11 @@ AC_DEFUN([CF_ENABLE_STRING_HACKS],
  AC_MSG_CHECKING(if you want to work around bogus compiler/loader warnings)
  AC_ARG_ENABLE(string-hacks,
         [  --enable-string-hacks   work around bogus compiler/loader warnings],
  AC_MSG_CHECKING(if you want to work around bogus compiler/loader warnings)
  AC_ARG_ENABLE(string-hacks,
         [  --enable-string-hacks   work around bogus compiler/loader warnings],
-       [with_string_hacks=$enableval],
-       [with_string_hacks=no])
-AC_MSG_RESULT($with_string_hacks)
+       [enable_string_hacks=$enableval],
+       [enable_string_hacks=no])
+AC_MSG_RESULT($enable_string_hacks)
  
  
-if test "x$with_string_hacks" = "xyes"; then
+if test "x$enable_string_hacks" = "xyes"; then
         AC_DEFINE(USE_STRING_HACKS,1,[Define to 1 to work around bogus compiler/loader warnings])
         AC_MSG_WARN(enabling string-hacks to work around bogus compiler/loader warnings)
         AC_CHECK_FUNC(strlcat,[
         AC_DEFINE(USE_STRING_HACKS,1,[Define to 1 to work around bogus compiler/loader warnings])
         AC_MSG_WARN(enabling string-hacks to work around bogus compiler/loader warnings)
         AC_CHECK_FUNC(strlcat,[
@@ -1342,7 +1409,7 @@ if test "x$with_string_hacks" = "xyes"; then
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_ENABLE_WARNINGS version: 7 updated: 2020/08/29 09:05:21
+dnl CF_ENABLE_WARNINGS version: 9 updated: 2021/01/05 19:40:50
  dnl ------------------
  dnl Configure-option to enable gcc warnings
  dnl
  dnl ------------------
  dnl Configure-option to enable gcc warnings
  dnl
@@ -1352,7 +1419,7 @@ dnl      warnings are enabled.  For other values:
  dnl      yes: always do this, e.g., to use in generated library-headers
  dnl      no: never do this
  AC_DEFUN([CF_ENABLE_WARNINGS],[
  dnl      yes: always do this, e.g., to use in generated library-headers
  dnl      no: never do this
  AC_DEFUN([CF_ENABLE_WARNINGS],[
-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes
  then
  CF_FIX_WARNINGS(CFLAGS)
  CF_FIX_WARNINGS(CPPFLAGS)
  then
  CF_FIX_WARNINGS(CFLAGS)
  CF_FIX_WARNINGS(CPPFLAGS)
@@ -1360,10 +1427,10 @@ CF_FIX_WARNINGS(LDFLAGS)
  AC_MSG_CHECKING(if you want to turn on gcc warnings)
  CF_ARG_ENABLE(warnings,
         [  --enable-warnings       test: turn on gcc compiler warnings],
  AC_MSG_CHECKING(if you want to turn on gcc warnings)
  CF_ARG_ENABLE(warnings,
         [  --enable-warnings       test: turn on gcc compiler warnings],
-       [with_warnings=yes],
-       [with_warnings=no])
-AC_MSG_RESULT($with_warnings)
-if test "$with_warnings" = "yes"
+       [enable_warnings=yes],
+       [enable_warnings=no])
+AC_MSG_RESULT($enable_warnings)
+if test "$enable_warnings" = "yes"
  then
         ifelse($2,,[CF_GCC_ATTRIBUTES])
         CF_GCC_WARNINGS($1)
  then
         ifelse($2,,[CF_GCC_ATTRIBUTES])
         CF_GCC_WARNINGS($1)
@@ -1372,7 +1439,7 @@ ifelse($2,yes,[CF_GCC_ATTRIBUTES])
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54
+dnl CF_FIND_LIBRARY version: 11 updated: 2021/01/02 09:31:20
  dnl ---------------
  dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
  dnl prefer a standard location, and use -L options only if we do not find the
  dnl ---------------
  dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
  dnl prefer a standard location, and use -L options only if we do not find the
@@ -1388,16 +1455,16 @@ dnl Sets the variable "$cf_libdir" as a side-effect, so we can see if we had
  dnl to use a -L option.
  AC_DEFUN([CF_FIND_LIBRARY],
  [
  dnl to use a -L option.
  AC_DEFUN([CF_FIND_LIBRARY],
  [
-       eval 'cf_cv_have_lib_'$1'=no'
+       eval 'cf_cv_have_lib_'"$1"'=no'
         cf_libdir=""
         AC_CHECK_FUNC($5,
         cf_libdir=""
         AC_CHECK_FUNC($5,
-               eval 'cf_cv_have_lib_'$1'=yes',[
+               eval 'cf_cv_have_lib_'"$1"'=yes',[
                 cf_save_LIBS="$LIBS"
                 AC_MSG_CHECKING(for $5 in -l$1)
                 LIBS="-l$1 $LIBS"
                 AC_TRY_LINK([$3],[$4],
                         [AC_MSG_RESULT(yes)
                 cf_save_LIBS="$LIBS"
                 AC_MSG_CHECKING(for $5 in -l$1)
                 LIBS="-l$1 $LIBS"
                 AC_TRY_LINK([$3],[$4],
                         [AC_MSG_RESULT(yes)
-                        eval 'cf_cv_have_lib_'$1'=yes'
+                        eval 'cf_cv_have_lib_'"$1"'=yes'
                         ],
                         [AC_MSG_RESULT(no)
                         CF_LIBRARY_PATH(cf_search,$2)
                         ],
                         [AC_MSG_RESULT(no)
                         CF_LIBRARY_PATH(cf_search,$2)
@@ -1407,22 +1474,22 @@ AC_DEFUN([CF_FIND_LIBRARY],
                                 LIBS="-L$cf_libdir -l$1 $cf_save_LIBS"
                                 AC_TRY_LINK([$3],[$4],
                                         [AC_MSG_RESULT(yes)
                                 LIBS="-L$cf_libdir -l$1 $cf_save_LIBS"
                                 AC_TRY_LINK([$3],[$4],
                                         [AC_MSG_RESULT(yes)
-                                        eval 'cf_cv_have_lib_'$1'=yes'
+                                        eval 'cf_cv_have_lib_'"$1"'=yes'
                                          break],
                                         [AC_MSG_RESULT(no)
                                          LIBS="$cf_save_LIBS"])
                         done
                         ])
                 ])
                                          break],
                                         [AC_MSG_RESULT(no)
                                          LIBS="$cf_save_LIBS"])
                         done
                         ])
                 ])
-eval 'cf_found_library=[$]cf_cv_have_lib_'$1
+eval 'cf_found_library="[$]cf_cv_have_lib_'"$1"\"
  ifelse($6,,[
  ifelse($6,,[
-if test $cf_found_library = no ; then
+if test "$cf_found_library" = no ; then
         AC_MSG_ERROR(Cannot link $1 library)
  fi
  ])
  ])dnl
  dnl ---------------------------------------------------------------------------
         AC_MSG_ERROR(Cannot link $1 library)
  fi
  ])
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_FIND_LINKAGE version: 21 updated: 2018/06/20 20:23:13
+dnl CF_FIND_LINKAGE version: 22 updated: 2020/12/31 20:19:42
  dnl ---------------
  dnl Find a library (specifically the linkage used in the code fragment),
  dnl searching for it if it is not already in the library path.
  dnl ---------------
  dnl Find a library (specifically the linkage used in the code fragment),
  dnl searching for it if it is not already in the library path.
@@ -1479,7 +1546,7 @@ AC_TRY_LINK([$1],[$2],[
         CF_HEADER_PATH(cf_search,ifelse([$6],,[$3],[$6]))
         for cf_cv_header_path_$3 in $cf_search
         do
         CF_HEADER_PATH(cf_search,ifelse([$6],,[$3],[$6]))
         for cf_cv_header_path_$3 in $cf_search
         do
-               if test -d $cf_cv_header_path_$3 ; then
+               if test -d "$cf_cv_header_path_$3" ; then
                         CF_VERBOSE(... testing $cf_cv_header_path_$3)
                         CPPFLAGS="$cf_save_CPPFLAGS"
                         CF_APPEND_TEXT(CPPFLAGS,-I$cf_cv_header_path_$3)
                         CF_VERBOSE(... testing $cf_cv_header_path_$3)
                         CPPFLAGS="$cf_save_CPPFLAGS"
                         CF_APPEND_TEXT(CPPFLAGS,-I$cf_cv_header_path_$3)
@@ -1514,7 +1581,7 @@ AC_TRY_LINK([$1],[$2],[
                         CF_LIBRARY_PATH(cf_search,$3)
                         for cf_cv_library_path_$3 in $cf_search
                         do
                         CF_LIBRARY_PATH(cf_search,$3)
                         for cf_cv_library_path_$3 in $cf_search
                         do
-                               if test -d $cf_cv_library_path_$3 ; then
+                               if test -d "$cf_cv_library_path_$3" ; then
                                         CF_VERBOSE(... testing $cf_cv_library_path_$3)
                                         CPPFLAGS="$cf_test_CPPFLAGS"
                                         LIBS="-l$3 $7 $cf_save_LIBS"
                                         CF_VERBOSE(... testing $cf_cv_library_path_$3)
                                         CPPFLAGS="$cf_test_CPPFLAGS"
                                         LIBS="-l$3 $7 $cf_save_LIBS"
@@ -1553,7 +1620,7 @@ ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5])
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_FIX_WARNINGS version: 2 updated: 2020/08/28 15:08:28
+dnl CF_FIX_WARNINGS version: 4 updated: 2021/12/16 18:22:31
  dnl ---------------
  dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc.  Any of gcc's
  dnl "-Werror" flags can interfere with configure-checks.  Those go into
  dnl ---------------
  dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc.  Any of gcc's
  dnl "-Werror" flags can interfere with configure-checks.  Those go into
@@ -1561,33 +1628,39 @@ dnl EXTRA_CFLAGS.
  dnl
  dnl $1 = variable name to repair
  define([CF_FIX_WARNINGS],[
  dnl
  dnl $1 = variable name to repair
  define([CF_FIX_WARNINGS],[
-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes
  then
         case [$]$1 in
         (*-Werror=*)
  then
         case [$]$1 in
         (*-Werror=*)
-               CF_VERBOSE(repairing $1: [$]$1)
                 cf_temp_flags=
                 for cf_temp_scan in [$]$1
                 do
                         case "x$cf_temp_scan" in
                 cf_temp_flags=
                 for cf_temp_scan in [$]$1
                 do
                         case "x$cf_temp_scan" in
+                       (x-Werror=format*)
+                               CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan)
+                               ;;
                         (x-Werror=*)
                         (x-Werror=*)
-                               CF_APPEND_TEXT(EXTRA_CFLAGS,"$cf_temp_scan")
+                               CF_APPEND_TEXT(EXTRA_CFLAGS,$cf_temp_scan)
                                 ;;
                         (*)
                                 ;;
                         (*)
-                               CF_APPEND_TEXT(cf_temp_flags,"$cf_temp_scan")
+                               CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan)
                                 ;;
                         esac
                 done
                                 ;;
                         esac
                 done
-               $1="$cf_temp_flags"
-               CF_VERBOSE(... fixed [$]$1)
-               CF_VERBOSE(... extra $EXTRA_CFLAGS)
+               if test "x[$]$1" != "x$cf_temp_flags"
+               then
+                       CF_VERBOSE(repairing $1: [$]$1)
+                       $1="$cf_temp_flags"
+                       CF_VERBOSE(... fixed [$]$1)
+                       CF_VERBOSE(... extra $EXTRA_CFLAGS)
+               fi
                 ;;
         esac
  fi
  AC_SUBST(EXTRA_CFLAGS)
  ])dnl
  dnl ---------------------------------------------------------------------------
                 ;;
         esac
  fi
  AC_SUBST(EXTRA_CFLAGS)
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_CURSES_VERSION version: 7 updated: 2017/05/10 18:31:29
+dnl CF_FUNC_CURSES_VERSION version: 9 updated: 2023/01/05 18:06:10
  dnl ----------------------
  dnl Solaris has a data item 'curses_version', which confuses AC_CHECK_FUNCS.
  dnl It's a character string "SVR4", not documented.
  dnl ----------------------
  dnl Solaris has a data item 'curses_version', which confuses AC_CHECK_FUNCS.
  dnl It's a character string "SVR4", not documented.
@@ -1595,11 +1668,14 @@ AC_DEFUN([CF_FUNC_CURSES_VERSION],
  [
  AC_CACHE_CHECK(for function curses_version, cf_cv_func_curses_version,[
  AC_TRY_RUN([
  [
  AC_CACHE_CHECK(for function curses_version, cf_cv_func_curses_version,[
  AC_TRY_RUN([
+$ac_includes_default
+
  #include <${cf_cv_ncurses_header:-curses.h}>
  #include <${cf_cv_ncurses_header:-curses.h}>
+
  int main(void)
  {
         char temp[1024];
  int main(void)
  {
         char temp[1024];
-       sprintf(temp, "%s\n", curses_version());
+       sprintf(temp, "%.999s\\n", curses_version());
         ${cf_cv_main_return:-return}(0);
  }]
  ,[cf_cv_func_curses_version=yes]
         ${cf_cv_main_return:-return}(0);
  }]
  ,[cf_cv_func_curses_version=yes]
@@ -1609,7 +1685,34 @@ rm -f core])
  test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 if we have curses_version function])
  ])
  dnl ---------------------------------------------------------------------------
  test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 if we have curses_version function])
  ])
  dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_OPENPTY version: 5 updated: 2015/09/12 14:46:50
+dnl CF_FUNC_GETTIME version: 2 updated: 2023/02/25 08:45:56
+dnl ---------------
+dnl Check for gettimeofday or clock_gettime.  In 2023, the former is still more
+dnl widely supported, but "deprecated" (2008), so we will use the latter if it
+dnl is available, to reduce compiler warnings.
+AC_DEFUN([CF_FUNC_GETTIME],[
+AC_CACHE_CHECK(for clock_gettime,cf_cv_func_clock_gettime,[
+               AC_TRY_LINK([#include <time.h>],
+               [struct timespec ts;
+               int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts],
+               [cf_cv_func_clock_gettime=yes],
+               [cf_cv_func_clock_gettime=no])
+])
+
+if test "$cf_cv_func_clock_gettime" = yes
+then
+       AC_DEFINE(HAVE_CLOCK_GETTIME,1,[Define to 1 if we have clock_gettime function])
+else
+AC_CHECK_FUNC(gettimeofday,
+       AC_DEFINE(HAVE_GETTIMEOFDAY,1,[Define to 1 if we have gettimeofday function]),[
+
+AC_CHECK_LIB(bsd, gettimeofday,
+       AC_DEFINE(HAVE_GETTIMEOFDAY,1,[Define to 1 if we have gettimeofday function])
+       CF_ADD_LIB(bsd))])dnl CLIX: bzero, select, gettimeofday
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_FUNC_OPENPTY version: 7 updated: 2023/12/03 09:21:34
  dnl ---------------
  dnl Check for openpty() function, along with <pty.h> header.  It may need the
  dnl "util" library as well.
  dnl ---------------
  dnl Check for openpty() function, along with <pty.h> header.  It may need the
  dnl "util" library as well.
@@ -1618,7 +1721,7 @@ AC_DEFUN([CF_FUNC_OPENPTY],
  AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no)
  AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
         cf_save_LIBS="$LIBS"
  AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no)
  AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
         cf_save_LIBS="$LIBS"
-       test $cf_cv_lib_util = yes && { CF_ADD_LIB(util) }
+       test "$cf_cv_lib_util" = yes && { CF_ADD_LIB(util) }
         for cf_header in pty.h libutil.h util.h
         do
         AC_TRY_LINK([
         for cf_header in pty.h libutil.h util.h
         do
         AC_TRY_LINK([
@@ -1626,6 +1729,7 @@ AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
  ],[
         int x = openpty((int *)0, (int *)0, (char *)0,
                                    (struct termios *)0, (struct winsize *)0);
  ],[
         int x = openpty((int *)0, (int *)0, (char *)0,
                                    (struct termios *)0, (struct winsize *)0);
+       (void)x;
  ],[
                 cf_cv_func_openpty=$cf_header
                 break
  ],[
                 cf_cv_func_openpty=$cf_header
                 break
@@ -1637,14 +1741,16 @@ AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
  ])
  ])dnl
  dnl ---------------------------------------------------------------------------
  ])
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_GCC_ATTRIBUTES version: 19 updated: 2020/08/29 09:05:21
+dnl CF_GCC_ATTRIBUTES version: 24 updated: 2021/03/20 12:00:25
  dnl -----------------
  dnl Test for availability of useful gcc __attribute__ directives to quiet
  dnl compiler warnings.  Though useful, not all are supported -- and contrary
  dnl to documentation, unrecognized directives cause older compilers to barf.
  AC_DEFUN([CF_GCC_ATTRIBUTES],
  dnl -----------------
  dnl Test for availability of useful gcc __attribute__ directives to quiet
  dnl compiler warnings.  Though useful, not all are supported -- and contrary
  dnl to documentation, unrecognized directives cause older compilers to barf.
  AC_DEFUN([CF_GCC_ATTRIBUTES],
-[
-if ( test "$GCC" = yes || test "$GXX" = yes )
+[AC_REQUIRE([AC_PROG_FGREP])dnl
+AC_REQUIRE([CF_C11_NORETURN])dnl
+
+if test "$GCC" = yes || test "$GXX" = yes
  then
  cat > conftest.i <<EOF
  #ifndef GCC_PRINTF
  then
  cat > conftest.i <<EOF
  #ifndef GCC_PRINTF
@@ -1663,8 +1769,9 @@ EOF
  if test "$GCC" = yes
  then
         AC_CHECKING([for $CC __attribute__ directives])
  if test "$GCC" = yes
  then
         AC_CHECKING([for $CC __attribute__ directives])
-cat > conftest.$ac_ext <<EOF
+cat > "conftest.$ac_ext" <<EOF
  #line __oline__ "${as_me:-configure}"
  #line __oline__ "${as_me:-configure}"
+#include <stdio.h>
  #include "confdefs.h"
  #include "conftest.h"
  #include "conftest.i"
  #include "confdefs.h"
  #include "conftest.h"
  #include "conftest.i"
@@ -1679,8 +1786,8 @@ cat > conftest.$ac_ext <<EOF
  #define GCC_SCANFLIKE(fmt,var)  /*nothing*/
  #endif
  extern void wow(char *,...) GCC_SCANFLIKE(1,2);
  #define GCC_SCANFLIKE(fmt,var)  /*nothing*/
  #endif
  extern void wow(char *,...) GCC_SCANFLIKE(1,2);
-extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
-extern void foo(void) GCC_NORETURN;
+extern GCC_NORETURN void oops(char *,...) GCC_PRINTFLIKE(1,2);
+extern GCC_NORETURN void foo(void);
  int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { (void)argc; (void)argv; return 0; }
  EOF
         cf_printf_attribute=no
  int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { (void)argc; (void)argv; return 0; }
  EOF
         cf_printf_attribute=no
@@ -1691,7 +1798,7 @@ EOF
                 cf_directive="__attribute__(($cf_attribute))"
                 echo "checking for $CC $cf_directive" 1>&AC_FD_CC
  
                 cf_directive="__attribute__(($cf_attribute))"
                 echo "checking for $CC $cf_directive" 1>&AC_FD_CC
  
-               case $cf_attribute in
+               case "$cf_attribute" in
                 (printf)
                         cf_printf_attribute=yes
                         cat >conftest.h <<EOF
                 (printf)
                         cf_printf_attribute=yes
                         cat >conftest.h <<EOF
@@ -1714,7 +1821,7 @@ EOF
                 if AC_TRY_EVAL(ac_compile); then
                         test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
                         cat conftest.h >>confdefs.h
                 if AC_TRY_EVAL(ac_compile); then
                         test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
                         cat conftest.h >>confdefs.h
-                       case $cf_attribute in
+                       case "$cf_attribute" in
                         (noreturn)
                                 AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
                                 ;;
                         (noreturn)
                                 AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
                                 ;;
@@ -1741,13 +1848,13 @@ EOF
                 fi
         done
  else
                 fi
         done
  else
-       fgrep define conftest.i >>confdefs.h
+       ${FGREP-fgrep} define conftest.i >>confdefs.h
  fi
  fi
-rm -rf conftest*
+rm -rf ./conftest*
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_GCC_VERSION version: 8 updated: 2019/09/07 13:38:36
+dnl CF_GCC_VERSION version: 9 updated: 2023/03/05 14:30:13
  dnl --------------
  dnl Find version of gcc, and (because icc/clang pretend to be gcc without being
  dnl compatible), attempt to determine if icc/clang is actually used.
  dnl --------------
  dnl Find version of gcc, and (because icc/clang pretend to be gcc without being
  dnl compatible), attempt to determine if icc/clang is actually used.
@@ -1756,7 +1863,7 @@ AC_REQUIRE([AC_PROG_CC])
  GCC_VERSION=none
  if test "$GCC" = yes ; then
         AC_MSG_CHECKING(version of $CC)
  GCC_VERSION=none
  if test "$GCC" = yes ; then
         AC_MSG_CHECKING(version of $CC)
-       GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[[^)]]*) //' -e 's/^.*(Debian[[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
+       GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[[^(]]*([[^)]][[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
         test -z "$GCC_VERSION" && GCC_VERSION=unknown
         AC_MSG_RESULT($GCC_VERSION)
  fi
         test -z "$GCC_VERSION" && GCC_VERSION=unknown
         AC_MSG_RESULT($GCC_VERSION)
  fi
@@ -1764,7 +1871,7 @@ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
  CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
  ])dnl
  dnl ---------------------------------------------------------------------------
  CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 38 updated: 2020/08/28 15:08:28
+dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59
  dnl ---------------
  dnl Check if the compiler supports useful warning options.  There's a few that
  dnl we don't use, simply because they're too noisy:
  dnl ---------------
  dnl Check if the compiler supports useful warning options.  There's a few that
  dnl we don't use, simply because they're too noisy:
@@ -1788,7 +1895,7 @@ AC_DEFUN([CF_GCC_WARNINGS],
  [
  AC_REQUIRE([CF_GCC_VERSION])
  if test "x$have_x" = xyes; then CF_CONST_X_STRING fi
  [
  AC_REQUIRE([CF_GCC_VERSION])
  if test "x$have_x" = xyes; then CF_CONST_X_STRING fi
-cat > conftest.$ac_ext <<EOF
+cat > "conftest.$ac_ext" <<EOF
  #line __oline__ "${as_me:-configure}"
  int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
  EOF
  #line __oline__ "${as_me:-configure}"
  int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
  EOF
@@ -1852,16 +1959,16 @@ then
                 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                 if AC_TRY_EVAL(ac_compile); then
                         test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
                 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                 if AC_TRY_EVAL(ac_compile); then
                         test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
-                       case $cf_opt in
+                       case "$cf_opt" in
                         (Winline)
                         (Winline)
-                               case $GCC_VERSION in
+                               case "$GCC_VERSION" in
                                 ([[34]].*)
                                         CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                         continue;;
                                 esac
                                 ;;
                         (Wpointer-arith)
                                 ([[34]].*)
                                         CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                         continue;;
                                 esac
                                 ;;
                         (Wpointer-arith)
-                               case $GCC_VERSION in
+                               case "$GCC_VERSION" in
                                 ([[12]].*)
                                         CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                         continue;;
                                 ([[12]].*)
                                         CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                         continue;;
@@ -1873,12 +1980,12 @@ then
         done
         CFLAGS="$cf_save_CFLAGS"
  fi
         done
         CFLAGS="$cf_save_CFLAGS"
  fi
-rm -rf conftest*
+rm -rf ./conftest*
  
  AC_SUBST(EXTRA_CFLAGS)
  ])dnl
  dnl ---------------------------------------------------------------------------
  
  AC_SUBST(EXTRA_CFLAGS)
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_GETOPT_HEADER version: 6 updated: 2014/07/22 14:45:54
+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
  dnl ----------------
  dnl Check for getopt's variables which are commonly defined in stdlib.h,
  dnl unistd.h or (nonstandard) in getopt.h
@@ -1891,15 +1998,15 @@ for cf_header in stdio.h stdlib.h unistd.h getopt.h
  do
  AC_TRY_COMPILE([
  #include <$cf_header>],
  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
  ])
  [cf_cv_getopt_header=$cf_header
   break])
  done
  ])
-if test $cf_cv_getopt_header != none ; then
+if test "$cf_cv_getopt_header" != none ; then
         AC_DEFINE(HAVE_GETOPT_HEADER,1,[Define to 1 if getopt variables are declared in header])
  fi
         AC_DEFINE(HAVE_GETOPT_HEADER,1,[Define to 1 if getopt variables are declared in header])
  fi
-if test $cf_cv_getopt_header = getopt.h ; then
+if test "$cf_cv_getopt_header" = getopt.h ; then
         AC_DEFINE(NEED_GETOPT_H,1,[Define to 1 if we must include getopt.h])
  fi
  ])dnl
         AC_DEFINE(NEED_GETOPT_H,1,[Define to 1 if we must include getopt.h])
  fi
  ])dnl
@@ -2015,7 +2122,7 @@ if test x$cf_cv_gnu_library = xyes; then
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_HEADER_PATH version: 13 updated: 2015/04/15 19:08:48
+dnl CF_HEADER_PATH version: 15 updated: 2021/01/01 13:31:04
  dnl --------------
  dnl Construct a search-list of directories for a nonstandard header-file
  dnl
  dnl --------------
  dnl Construct a search-list of directories for a nonstandard header-file
  dnl
@@ -2031,7 +2138,7 @@ cf_header_path_list=""
  if test -n "${CFLAGS}${CPPFLAGS}" ; then
         for cf_header_path in $CPPFLAGS $CFLAGS
         do
  if test -n "${CFLAGS}${CPPFLAGS}" ; then
         for cf_header_path in $CPPFLAGS $CFLAGS
         do
-               case $cf_header_path in
+               case "$cf_header_path" in
                 (-I*)
                         cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
                         CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)
                 (-I*)
                         cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
                         CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)
@@ -2047,15 +2154,15 @@ CF_SUBDIR_PATH($1,$2,include)
  test "$includedir" != NONE && \
  test "$includedir" != "/usr/include" && \
  test -d "$includedir" && {
  test "$includedir" != NONE && \
  test "$includedir" != "/usr/include" && \
  test -d "$includedir" && {
-       test -d $includedir &&    $1="[$]$1 $includedir"
-       test -d $includedir/$2 && $1="[$]$1 $includedir/$2"
+       test -d "$includedir" &&    $1="[$]$1 $includedir"
+       test -d "$includedir/$2" && $1="[$]$1 $includedir/$2"
  }
  
  test "$oldincludedir" != NONE && \
  test "$oldincludedir" != "/usr/include" && \
  test -d "$oldincludedir" && {
  }
  
  test "$oldincludedir" != NONE && \
  test "$oldincludedir" != "/usr/include" && \
  test -d "$oldincludedir" && {
-       test -d $oldincludedir    && $1="[$]$1 $oldincludedir"
-       test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
+       test -d "$oldincludedir"    && $1="[$]$1 $oldincludedir"
+       test -d "$oldincludedir/$2" && $1="[$]$1 $oldincludedir/$2"
  }
  
  $1="[$]$1 $cf_header_path_list"
  }
  
  $1="[$]$1 $cf_header_path_list"
@@ -2077,7 +2184,7 @@ AC_DEFUN([CF_INHERIT_SCRIPT],
  test -f $1 || ( test -f ../$1 && cp ../$1 ./ )
  ])dnl
  dnl ---------------------------------------------------------------------------
  test -f $1 || ( test -f ../$1 && cp ../$1 ./ )
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_INSTALL_OPTS version: 2 updated: 2018/08/18 12:19:21
+dnl CF_INSTALL_OPTS version: 3 updated: 2023/06/03 15:17:30
  dnl ---------------
  dnl prompt for/fill-in useful install-program options
  AC_DEFUN([CF_INSTALL_OPTS],
  dnl ---------------
  dnl prompt for/fill-in useful install-program options
  AC_DEFUN([CF_INSTALL_OPTS],
@@ -2085,9 +2192,10 @@ AC_DEFUN([CF_INSTALL_OPTS],
  CF_INSTALL_OPT_S
  CF_INSTALL_OPT_P
  CF_INSTALL_OPT_O
  CF_INSTALL_OPT_S
  CF_INSTALL_OPT_P
  CF_INSTALL_OPT_O
+CF_INSTALL_OPT_STRIP_PROG
  ])dnl
  dnl ---------------------------------------------------------------------------
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_INSTALL_OPT_O version: 2 updated: 2015/05/15 19:45:35
+dnl CF_INSTALL_OPT_O version: 3 updated: 2020/12/31 20:19:42
  dnl ----------------
  dnl Almost all "install" programs default to the current user's ownership.
  dnl Almost - MINIX is an exception.
  dnl ----------------
  dnl Almost all "install" programs default to the current user's ownership.
  dnl Almost - MINIX is an exception.
@@ -2106,7 +2214,7 @@ esac
  AC_MSG_RESULT($with_install_o)
  if test "x$with_install_o" = xyes
  then
  AC_MSG_RESULT($with_install_o)
  if test "x$with_install_o" = xyes
  then
-       INSTALL_OPT_O=`id root|sed -e 's/uid=[[0-9]]*(/ -o /' -e 's/gid=[[0-9]]*(/ -g /' -e 's/ [[^=[:space:]]][[^=[:space:]]]*=.*/ /' -e 's/)//g'`
+       INSTALL_OPT_O="`id root|sed -e 's/uid=[[0-9]]*(/ -o /' -e 's/gid=[[0-9]]*(/ -g /' -e 's/ [[^=[:space:]]][[^=[:space:]]]*=.*/ /' -e 's/)//g'`"
  else
         INSTALL_OPT_O=
  fi
  else
         INSTALL_OPT_O=
  fi
@@ -2114,16 +2222,16 @@ fi
  AC_SUBST(INSTALL_OPT_O)
  ])dnl
  dnl ---------------------------------------------------------------------------
  AC_SUBST(INSTALL_OPT_O)
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_INSTALL_OPT_P version: 1 updated: 2018/08/18 12:19:21
+dnl CF_INSTALL_OPT_P version: 3 updated: 2021/01/01 13:31:04
  dnl ----------------
  dnl Some install-programs accept a "-p" option to preserve file modification
  dnl timestamps.  That can be useful as an install option, as well as a way to
  dnl avoid the need for ranlib after copying a static archive.
  AC_DEFUN([CF_INSTALL_OPT_P],
  [
  dnl ----------------
  dnl Some install-programs accept a "-p" option to preserve file modification
  dnl timestamps.  That can be useful as an install option, as well as a way to
  dnl avoid the need for ranlib after copying a static archive.
  AC_DEFUN([CF_INSTALL_OPT_P],
  [
-: ${INSTALL:=install}
+: "${INSTALL:=install}"
  AC_CACHE_CHECK(if install accepts -p option, cf_cv_install_p,[
  AC_CACHE_CHECK(if install accepts -p option, cf_cv_install_p,[
-       rm -rf conftest*
+       rm -rf ./conftest*
         date >conftest.in
         mkdir conftest.out
         sleep 3
         date >conftest.in
         mkdir conftest.out
         sleep 3
@@ -2145,11 +2253,11 @@ AC_CACHE_CHECK(if install accepts -p option, cf_cv_install_p,[
         else
                 cf_cv_install_p=no
         fi
         else
                 cf_cv_install_p=no
         fi
-       rm -rf conftest*
+       rm -rf ./conftest*
  ])
  ])dnl
  dnl ---------------------------------------------------------------------------
  ])
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_INSTALL_OPT_S version: 2 updated: 2018/08/18 12:19:21
+dnl CF_INSTALL_OPT_S version: 3 updated: 2021/01/05 19:23:48
  dnl ----------------
  dnl By default, we should strip executables which are installed, but leave the
  dnl ability to suppress that for unit-testing.
  dnl ----------------
  dnl By default, we should strip executables which are installed, but leave the
  dnl ability to suppress that for unit-testing.
@@ -2158,11 +2266,11 @@ AC_DEFUN([CF_INSTALL_OPT_S],
  AC_MSG_CHECKING(if you want to install stripped executables)
  CF_ARG_DISABLE(stripping,
         [  --disable-stripping     do not strip (debug info) installed executables],
  AC_MSG_CHECKING(if you want to install stripped executables)
  CF_ARG_DISABLE(stripping,
         [  --disable-stripping     do not strip (debug info) installed executables],
-       [with_stripping=no],
-       [with_stripping=yes])
-AC_MSG_RESULT($with_stripping)
+       [enable_stripping=no],
+       [enable_stripping=yes])
+AC_MSG_RESULT($enable_stripping)
  
  
-if test "$with_stripping" = yes
+if test "$enable_stripping" = yes
  then
         INSTALL_OPT_S="-s"
  else
  then
         INSTALL_OPT_S="-s"
  else
@@ -2171,7 +2279,73 @@ fi
  AC_SUBST(INSTALL_OPT_S)
  ])dnl
  dnl ---------------------------------------------------------------------------
  AC_SUBST(INSTALL_OPT_S)
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_INTEL_COMPILER version: 7 updated: 2015/04/12 15:39:00
+dnl CF_INSTALL_OPT_STRIP_PROG version: 1 updated: 2023/06/03 15:17:30
+dnl -------------------------
+dnl Provide an option for overriding the strip program used in install "-s"
+dnl
+dnl coreutils install provides a --strip-program option
+dnl FreeBSD uses STRIPBIN environment variable, while NetBSD and OpenBSD use
+dnl STRIP environment variable.  Other versions of install do not support this.
+AC_DEFUN([CF_INSTALL_OPT_STRIP_PROG],
+[
+AC_REQUIRE([CF_INSTALL_OPT_S])
+if test -n "$INSTALL_OPT_S"
+then
+       AC_MSG_CHECKING(if you want to specify strip-program)
+       AC_ARG_WITH(strip-program,
+               [  --with-strip-program=XX specify program to use when stripping in install],
+               [with_strip_program=$withval],
+               [with_strip_program=no])
+       AC_MSG_RESULT($with_strip_program)
+       if test "$with_strip_program" != no
+       then
+               AC_MSG_CHECKING(if strip-program is supported with this installer)
+               cf_install_program=`echo "$INSTALL" | sed -e 's%[[ ]]*[[ ]]-.%%'`
+               check_install_strip=no
+               if test -f "$cf_install_program"
+               then
+                       check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils`
+                       if test -n "$check_install_version"
+                       then
+                               check_install_strip="option"
+                       else
+                               for check_strip_variable in STRIPBIN STRIP
+                               do
+                                       if strings "$cf_install_program" | grep "^$check_strip_variable[$]" >/dev/null
+                                       then
+                                               check_install_strip="environ"
+                                               break
+                                       fi
+                               done
+                       fi
+               fi
+               AC_MSG_RESULT($check_install_strip)
+               case "$check_install_strip" in
+               (no)
+                       AC_MSG_WARN($cf_install_program does not support strip program option)
+                       with_strip_program=no
+                       ;;
+               (environ)
+                       cat >install.tmp <<-CF_EOF
+                       #! $SHELL
+                       STRIPBIN="$with_strip_program" \\
+                       STRIP="$with_strip_program" \\
+                       $INSTALL "[$]@"
+                       CF_EOF
+                       INSTALL="`pwd`/install.tmp"
+                       chmod +x "$INSTALL"
+                       CF_VERBOSE(created $INSTALL)
+                       ;;
+               (option)
+                       INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\""
+                       ;;
+               esac
+       fi
+fi
+AC_SUBST(INSTALL_OPT_S)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25
  dnl -----------------
  dnl Check if the given compiler is really the Intel compiler for Linux.  It
  dnl tries to imitate gcc, but does not return an error when it finds a mismatch
  dnl -----------------
  dnl Check if the given compiler is really the Intel compiler for Linux.  It
  dnl tries to imitate gcc, but does not return an error when it finds a mismatch
@@ -2189,7 +2363,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])
  ifelse([$2],,INTEL_COMPILER,[$2])=no
  
  if test "$ifelse([$1],,[$1],GCC)" = yes ; then
  ifelse([$2],,INTEL_COMPILER,[$2])=no
  
  if test "$ifelse([$1],,[$1],GCC)" = yes ; then
-       case $host_os in
+       case "$host_os" in
         (linux*|gnu*)
                 AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler)
                 cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
         (linux*|gnu*)
                 AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler)
                 cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
@@ -2197,7 +2371,7 @@ if test "$ifelse([$1],,[$1],GCC)" = yes ; then
                 AC_TRY_COMPILE([],[
  #ifdef __INTEL_COMPILER
  #else
                 AC_TRY_COMPILE([],[
  #ifdef __INTEL_COMPILER
  #else
-make an error
+#error __INTEL_COMPILER is not defined
  #endif
  ],[ifelse([$2],,INTEL_COMPILER,[$2])=yes
  cf_save_CFLAGS="$cf_save_CFLAGS -we147"
  #endif
  ],[ifelse([$2],,INTEL_COMPILER,[$2])=yes
  cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -2209,7 +2383,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_LD_RPATH_OPT version: 8 updated: 2018/08/18 16:36:35
+dnl CF_LD_RPATH_OPT version: 9 updated: 2021/01/01 13:31:04
  dnl ---------------
  dnl For the given system and compiler, find the compiler flags to pass to the
  dnl loader to use the "rpath" feature.
  dnl ---------------
  dnl For the given system and compiler, find the compiler flags to pass to the
  dnl loader to use the "rpath" feature.
@@ -2221,7 +2395,7 @@ LD_RPATH_OPT=
  if test "x$cf_cv_enable_rpath" != xno
  then
         AC_MSG_CHECKING(for an rpath option)
  if test "x$cf_cv_enable_rpath" != xno
  then
         AC_MSG_CHECKING(for an rpath option)
-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in
         (irix*)
                 if test "$GCC" = yes; then
                         LD_RPATH_OPT="-Wl,-rpath,"
         (irix*)
                 if test "$GCC" = yes; then
                         LD_RPATH_OPT="-Wl,-rpath,"
@@ -2266,7 +2440,7 @@ then
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_LIBRARY_PATH version: 10 updated: 2015/04/15 19:08:48
+dnl CF_LIBRARY_PATH version: 11 updated: 2021/01/01 13:31:04
  dnl ---------------
  dnl Construct a search-list of directories for a nonstandard library-file
  dnl
  dnl ---------------
  dnl Construct a search-list of directories for a nonstandard library-file
  dnl
@@ -2280,7 +2454,7 @@ cf_library_path_list=""
  if test -n "${LDFLAGS}${LIBS}" ; then
         for cf_library_path in $LDFLAGS $LIBS
         do
  if test -n "${LDFLAGS}${LIBS}" ; then
         for cf_library_path in $LDFLAGS $LIBS
         do
-               case $cf_library_path in
+               case "$cf_library_path" in
                 (-L*)
                         cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
                         CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE)
                 (-L*)
                         cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
                         CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE)
@@ -2295,6 +2469,89 @@ CF_SUBDIR_PATH($1,$2,lib)
  $1="$cf_library_path_list [$]$1"
  ])dnl
  dnl ---------------------------------------------------------------------------
  $1="$cf_library_path_list [$]$1"
  ])dnl
  dnl ---------------------------------------------------------------------------
+dnl CF_MAKE_PHONY version: 3 updated: 2021/01/08 16:08:21
+dnl -------------
+dnl Check if the make-program handles a ".PHONY" target, e.g,. a target which
+dnl acts as a placeholder.
+dnl
+dnl The ".PHONY" feature was proposed in 2011 here
+dnl     https://www.austingroupbugs.net/view.php?id=523
+dnl and is scheduled for release in P1003.1 Issue 8 (late 2022).
+dnl
+dnl This is not supported by SVr4 make (or SunOS 4, 4.3SD, etc), but works with
+dnl a few others (i.e., GNU make and the non-POSIX "BSD" make):
+dnl
+dnl + This is a GNU make feature (since April 1988, but in turn from binutils,
+dnl   date unspecified).
+dnl
+dnl + It was adopted in NetBSD make in June 1995.
+dnl
+dnl + The other BSD make programs are derived from the NetBSD make (and for
+dnl   that reason are not actually different "implementations").
+dnl
+dnl + Some features of NetBSD make were actually adapted from pmake, which
+dnl   began as a modified GNU make starting in 1993.
+dnl
+dnl + Version 3.8 of the dmake program in January 1992 also implemented this
+dnl   GNU make extension, but is less well known than the BSD make.
+AC_DEFUN([CF_MAKE_PHONY],[
+AC_CACHE_CHECK(for \".PHONY\" make-support, cf_cv_make_PHONY,[
+       rm -rf conftest*
+       (
+               mkdir conftest || exit 1
+               cd conftest
+               cat >makefile <<'CF_EOF'
+.PHONY: always
+DATA=0
+always:        always.out
+       @echo "** making [$]@ [$](DATA)"
+once: once.out
+       @echo "** making [$]@ [$](DATA)"
+always.out:
+       @echo "** making [$]@ [$](DATA)"
+       echo [$](DATA) > [$]@
+once.out:
+       @echo "** making [$]@ [$](DATA)"
+       echo [$](DATA) > [$]@
+CF_EOF
+               for cf_data in 1 2 3
+               do
+                       ${MAKE:-make} always DATA=$cf_data
+                       ${MAKE:-make} once   DATA=$cf_data
+                       ${MAKE:-make} -t always once
+                       if test -f always ; then
+                               echo "no (case 1)" > ../conftest.tmp
+                       elif test ! -f always.out ; then
+                               echo "no (case 2)" > ../conftest.tmp
+                       elif test ! -f once.out ; then
+                               echo "no (case 3)" > ../conftest.tmp
+                       elif ! cmp -s always.out once.out ; then
+                               echo "no (case 4)" > ../conftest.tmp
+                               diff always.out once.out
+                       else
+                               cf_check="`cat always.out`"
+                               if test "x$cf_check" != "x$cf_data" ; then
+                                       echo "no (case 5)" > ../conftest.tmp
+                               else
+                                       echo yes > ../conftest.tmp
+                                       rm -f ./*.out
+                                       continue
+                               fi
+                       fi
+                       break
+               done
+       ) >&AC_FD_CC 2>&1
+       cf_cv_make_PHONY="`cat conftest.tmp`"
+       rm -rf conftest*
+])
+MAKE_NO_PHONY="#"
+MAKE_PHONY="#"
+test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY=
+test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY=
+AC_SUBST(MAKE_NO_PHONY)
+AC_SUBST(MAKE_PHONY)
+])dnl
+dnl ---------------------------------------------------------------------------
  dnl CF_MAKE_TAGS version: 6 updated: 2010/10/23 15:52:32
  dnl ------------
  dnl Generate tags/TAGS targets for makefiles.  Do not generate TAGS if we have
  dnl CF_MAKE_TAGS version: 6 updated: 2010/10/23 15:52:32
  dnl ------------
  dnl Generate tags/TAGS targets for makefiles.  Do not generate TAGS if we have
@@ -2332,7 +2589,7 @@ AC_SUBST(MAKE_UPPER_TAGS)
  AC_SUBST(MAKE_LOWER_TAGS)
  ])dnl
  dnl ---------------------------------------------------------------------------
  AC_SUBST(MAKE_LOWER_TAGS)
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_MATH_LIB version: 9 updated: 2017/01/21 11:06:25
+dnl CF_MATH_LIB version: 11 updated: 2022/07/27 19:01:48
  dnl -----------
  dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
  dnl Rhapsody 5.5, does not have -lm.  We cannot use the simpler
  dnl -----------
  dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
  dnl Rhapsody 5.5, does not have -lm.  We cannot use the simpler
@@ -2342,22 +2599,46 @@ AC_DEFUN([CF_MATH_LIB],
  AC_CACHE_CHECK(if -lm needed for math functions,
         cf_cv_need_libm,[
         AC_TRY_LINK([
  AC_CACHE_CHECK(if -lm needed for math functions,
         cf_cv_need_libm,[
         AC_TRY_LINK([
-       #include <stdio.h>
-       #include <stdlib.h>
-       #include <math.h>
+               #include <stdio.h>
+               #include <stdlib.h>
+               #include <math.h>
         ],
         ],
-       [double x = rand(); printf("result = %g\n", ]ifelse([$2],,sin(x),$2)[)],
+       [double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)],
         [cf_cv_need_libm=no],
         [cf_cv_need_libm=yes])])
         [cf_cv_need_libm=no],
         [cf_cv_need_libm=yes])])
+
  if test "$cf_cv_need_libm" = yes
  then
  if test "$cf_cv_need_libm" = yes
  then
-ifelse($1,,[
-       CF_ADD_LIB(m)
-],[$1=-lm])
+
+       cf_save_LIBS="$LIBS"
+       LIBS="$LIBS -lm"
+       AC_CACHE_CHECK(if -lm is available for math functions,
+       cf_cv_have_libm,[
+       AC_TRY_LINK([
+               #include <stdio.h>
+               #include <stdlib.h>
+               #include <math.h>
+       ],
+       [double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)],
+       [cf_cv_have_libm=yes],
+       [cf_cv_have_libm=no])])
+       LIBS="$cf_save_LIBS"
+
+       if test "$cf_cv_have_libm" = yes
+       then
+               ifelse($1,,[CF_ADD_LIB(m)],[$1=-lm])
+       fi
+else
+       cf_cv_have_libm=yes
+fi
+
+if test "$cf_cv_have_libm" = yes
+then
+       AC_DEFINE(HAVE_MATH_FUNCS,1,[Define to 1 if math functions are available])
  fi
  ])
  dnl ---------------------------------------------------------------------------
  fi
  ])
  dnl ---------------------------------------------------------------------------
-dnl CF_MIXEDCASE_FILENAMES version: 8 updated: 2020/11/14 10:12:15
+dnl CF_MIXEDCASE_FILENAMES version: 9 updated: 2021/01/01 16:53:59
  dnl ----------------------
  dnl Check if the file-system supports mixed-case filenames.  If we're able to
  dnl create a lowercase name and see it as uppercase, it doesn't support that.
  dnl ----------------------
  dnl Check if the file-system supports mixed-case filenames.  If we're able to
  dnl create a lowercase name and see it as uppercase, it doesn't support that.
@@ -2365,7 +2646,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES],
  [
  AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
  if test "$cross_compiling" = yes ; then
  [
  AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
  if test "$cross_compiling" = yes ; then
-       case $target_alias in
+       case "$target_alias" in
         (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
                 cf_cv_mixedcase=no
                 ;;
         (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
                 cf_cv_mixedcase=no
                 ;;
@@ -2395,7 +2676,7 @@ AC_DEFUN([CF_MSG_LOG],[
  echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
  ])dnl
  dnl ---------------------------------------------------------------------------
  echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CC_CHECK version: 4 updated: 2007/07/29 10:39:05
+dnl CF_NCURSES_CC_CHECK version: 6 updated: 2023/02/18 17:47:58
  dnl -------------------
  dnl Check if we can compile with ncurses' header file
  dnl $1 is the cache variable to set
  dnl -------------------
  dnl Check if we can compile with ncurses' header file
  dnl $1 is the cache variable to set
@@ -2412,15 +2693,15 @@ AC_DEFUN([CF_NCURSES_CC_CHECK],[
  #ifdef NCURSES_VERSION
  ]ifelse($3,ncursesw,[
  #ifndef WACS_BSSB
  #ifdef NCURSES_VERSION
  ]ifelse($3,ncursesw,[
  #ifndef WACS_BSSB
-       make an error
+       #error WACS_BSSB is not defined
  #endif
  ])[
  #endif
  ])[
-printf("%s\n", NCURSES_VERSION);
+printf("%s\\n", NCURSES_VERSION);
  #else
  #ifdef __NCURSES_H
  #else
  #ifdef __NCURSES_H
-printf("old\n");
+printf("old\\n");
  #else
  #else
-       make an error
+       #error __NCURSES_H is not defined
  #endif
  #endif
         ]
  #endif
  #endif
         ]
@@ -2428,7 +2709,7 @@ printf("old\n");
         ,[$1=no])
  ])dnl
  dnl ---------------------------------------------------------------------------
         ,[$1=no])
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CONFIG version: 23 updated: 2020/02/27 05:21:59
+dnl CF_NCURSES_CONFIG version: 28 updated: 2021/08/28 15:20:37
  dnl -----------------
  dnl Tie together the configure-script macros for ncurses, preferring these in
  dnl order:
  dnl -----------------
  dnl Tie together the configure-script macros for ncurses, preferring these in
  dnl order:
@@ -2454,10 +2735,10 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
                 cf_save_CPPFLAGS="$CPPFLAGS"
                 cf_save_LIBS="$LIBS"
  
                 cf_save_CPPFLAGS="$CPPFLAGS"
                 cf_save_LIBS="$LIBS"
  
-               cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
-               cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
+               cf_pkg_cflags="`$PKG_CONFIG --cflags $cf_ncuconfig_root`"
+               cf_pkg_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"
  
  
-               # while -W for passing linker flags is prevalent, it is not "standard". 
+               # while -W for passing linker flags is prevalent, it is not "standard".
                 # At least one wrapper for c89/c99 (in Apple's xcode) has its own
                 # incompatible _and_ non-standard -W option which gives an error.  Work
                 # around that pitfall.
                 # At least one wrapper for c89/c99 (in Apple's xcode) has its own
                 # incompatible _and_ non-standard -W option which gives an error.  Work
                 # around that pitfall.
@@ -2467,10 +2748,10 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
                         CF_ADD_LIBS($cf_pkg_libs)
  
                         AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
                         CF_ADD_LIBS($cf_pkg_libs)
  
                         AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
-                               [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
+                               [initscr(); mousemask(0,0); tigetstr((char *)0);],
                                 [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                         int main(void)
                                 [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                         int main(void)
-                                       { char *xx = curses_version(); return (xx == 0); }],
+                                       { const char *xx = curses_version(); return (xx == 0); }],
                                         [cf_test_ncuconfig=yes],
                                         [cf_test_ncuconfig=no],
                                         [cf_test_ncuconfig=maybe])],
                                         [cf_test_ncuconfig=yes],
                                         [cf_test_ncuconfig=no],
                                         [cf_test_ncuconfig=maybe])],
@@ -2489,14 +2770,14 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
                         ;;
                 esac
  
                         ;;
                 esac
  
-               CF_ADD_CFLAGS($cf_pkg_cflags)
+               CF_APPEND_CFLAGS($cf_pkg_cflags)
                 CF_ADD_LIBS($cf_pkg_libs)
  
                 AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
                 CF_ADD_LIBS($cf_pkg_libs)
  
                 AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
-                       [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
+                       [initscr(); mousemask(0,0); tigetstr((char *)0);],
                         [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                 int main(void)
                         [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                 int main(void)
-                               { char *xx = curses_version(); return (xx == 0); }],
+                               { const char *xx = curses_version(); return (xx == 0); }],
                                 [cf_have_ncuconfig=yes],
                                 [cf_have_ncuconfig=no],
                                 [cf_have_ncuconfig=maybe])],
                                 [cf_have_ncuconfig=yes],
                                 [cf_have_ncuconfig=no],
                                 [cf_have_ncuconfig=maybe])],
@@ -2531,7 +2812,7 @@ if test "x$cf_have_ncuconfig" = "xno"; then
  
         if test "$NCURSES_CONFIG" != none ; then
  
  
         if test "$NCURSES_CONFIG" != none ; then
  
-               CF_ADD_CFLAGS(`$NCURSES_CONFIG --cflags`)
+               CF_APPEND_CFLAGS(`$NCURSES_CONFIG --cflags`)
                 CF_ADD_LIBS(`$NCURSES_CONFIG --libs`)
  
                 # even with config script, some packages use no-override for curses.h
                 CF_ADD_LIBS(`$NCURSES_CONFIG --libs`)
  
                 # even with config script, some packages use no-override for curses.h
@@ -2545,7 +2826,7 @@ if test "x$cf_have_ncuconfig" = "xno"; then
                 AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
  
                 dnl like CF_NCURSES_VERSION
                 AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
  
                 dnl like CF_NCURSES_VERSION
-               cf_cv_ncurses_version=`$NCURSES_CONFIG --version`
+               cf_cv_ncurses_version="`$NCURSES_CONFIG --version`"
  
         else
  
  
         else
  
@@ -2558,7 +2839,7 @@ else
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CPPFLAGS version: 21 updated: 2012/10/06 08:57:51
+dnl CF_NCURSES_CPPFLAGS version: 22 updated: 2021/01/02 09:31:20
  dnl -------------------
  dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
  dnl the CPPFLAGS variable so we can include its header.
  dnl -------------------
  dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
  dnl the CPPFLAGS variable so we can include its header.
@@ -2592,7 +2873,7 @@ test "$cf_cv_curses_dir" != "no" && { \
  
  AC_CACHE_CHECK(for $cf_ncuhdr_root header in include-path, cf_cv_ncurses_h,[
         cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"
  
  AC_CACHE_CHECK(for $cf_ncuhdr_root header in include-path, cf_cv_ncurses_h,[
         cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"
-       ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h"
+       { test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw; } && cf_header_list="$cf_header_list curses.h ncurses.h"
         for cf_header in $cf_header_list
         do
                 CF_NCURSES_CC_CHECK(cf_cv_ncurses_h,$cf_header,$1)
         for cf_header in $cf_header_list
         do
                 CF_NCURSES_CC_CHECK(cf_cv_ncurses_h,$cf_header,$1)
@@ -2644,7 +2925,7 @@ AC_TRY_LINK([
  test "$cf_cv_ncurses_ext_funcs" = yes && AC_DEFINE(NCURSES_EXT_FUNCS,1,[Define to 1 if we have ncurses extensions])
  ])dnl
  dnl ---------------------------------------------------------------------------
  test "$cf_cv_ncurses_ext_funcs" = yes && AC_DEFINE(NCURSES_EXT_FUNCS,1,[Define to 1 if we have ncurses extensions])
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_HEADER version: 4 updated: 2015/04/15 19:08:48
+dnl CF_NCURSES_HEADER version: 7 updated: 2021/01/04 19:33:05
  dnl -----------------
  dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
  dnl variations of ncurses' installs.
  dnl -----------------
  dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
  dnl variations of ncurses' installs.
@@ -2659,7 +2940,7 @@ else
  AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[
         test -n "$verbose" && echo
         CF_HEADER_PATH(cf_search,$cf_ncuhdr_root)
  AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[
         test -n "$verbose" && echo
         CF_HEADER_PATH(cf_search,$cf_ncuhdr_root)
-       test -n "$verbose" && echo search path $cf_search
+       test -n "$verbose" && echo "search path $cf_search"
         cf_save2_CPPFLAGS="$CPPFLAGS"
         for cf_incdir in $cf_search
         do
         cf_save2_CPPFLAGS="$CPPFLAGS"
         for cf_incdir in $cf_search
         do
@@ -2671,7 +2952,7 @@ AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[
                         CF_NCURSES_CC_CHECK(cf_cv_ncurses_h2,$cf_header,$1)
                         if test "$cf_cv_ncurses_h2" != no ; then
                                 cf_cv_ncurses_h2=$cf_incdir/$cf_header
                         CF_NCURSES_CC_CHECK(cf_cv_ncurses_h2,$cf_header,$1)
                         if test "$cf_cv_ncurses_h2" != no ; then
                                 cf_cv_ncurses_h2=$cf_incdir/$cf_header
-                               test -n "$verbose" && echo $ac_n "      ... found $ac_c" 1>&AC_FD_MSG
+                               test -n "$verbose" && echo $ECHO_N "    ... found $ECHO_C" 1>&AC_FD_MSG
                                 break
                         fi
                         test -n "$verbose" && echo "    ... tested $cf_incdir/$cf_header" 1>&AC_FD_MSG
                                 break
                         fi
                         test -n "$verbose" && echo "    ... tested $cf_incdir/$cf_header" 1>&AC_FD_MSG
@@ -2683,9 +2964,9 @@ AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[
         ])
  
         CF_DIRNAME(cf_1st_incdir,$cf_cv_ncurses_h2)
         ])
  
         CF_DIRNAME(cf_1st_incdir,$cf_cv_ncurses_h2)
-       cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2`
-       if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then
-               cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header
+       cf_cv_ncurses_header="`basename "$cf_cv_ncurses_h2"`"
+       if test "`basename "$cf_1st_incdir"`" = "$cf_ncuhdr_root" ; then
+               cf_cv_ncurses_header="$cf_ncuhdr_root/$cf_cv_ncurses_header"
         fi
         CF_ADD_INCDIR($cf_1st_incdir)
  
         fi
         CF_ADD_INCDIR($cf_1st_incdir)
  
@@ -2693,13 +2974,13 @@ fi
  
  # Set definitions to allow ifdef'ing for ncurses.h
  
  
  # Set definitions to allow ifdef'ing for ncurses.h
  
-case $cf_cv_ncurses_header in
+case "$cf_cv_ncurses_header" in
  (*ncurses.h)
         AC_DEFINE(HAVE_NCURSES_H,1,[Define to 1 if we have ncurses.h])
         ;;
  esac
  
  (*ncurses.h)
         AC_DEFINE(HAVE_NCURSES_H,1,[Define to 1 if we have ncurses.h])
         ;;
  esac
  
-case $cf_cv_ncurses_header in
+case "$cf_cv_ncurses_header" in
  (ncurses/curses.h|ncurses/ncurses.h)
         AC_DEFINE(HAVE_NCURSES_NCURSES_H,1,[Define to 1 if we have ncurses/ncurses.h])
         ;;
  (ncurses/curses.h|ncurses/ncurses.h)
         AC_DEFINE(HAVE_NCURSES_NCURSES_H,1,[Define to 1 if we have ncurses/ncurses.h])
         ;;
@@ -2710,7 +2991,7 @@ esac
  
  ])dnl
  dnl ---------------------------------------------------------------------------
  
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_LIBS version: 17 updated: 2015/04/15 19:08:48
+dnl CF_NCURSES_LIBS version: 21 updated: 2021/09/04 06:37:12
  dnl ---------------
  dnl Look for the ncurses library.  This is a little complicated on Linux,
  dnl because it may be linked with the gpm (general purpose mouse) library.
  dnl ---------------
  dnl Look for the ncurses library.  This is a little complicated on Linux,
  dnl because it may be linked with the gpm (general purpose mouse) library.
@@ -2736,10 +3017,10 @@ AC_CHECK_LIB(gpm,Gpm_Open,
                 [LIBS="$cf_ncurses_SAVE"],
                 [cf_ncurses_LIBS="-lgpm"])])
  
                 [LIBS="$cf_ncurses_SAVE"],
                 [cf_ncurses_LIBS="-lgpm"])])
  
-case $host_os in
+case "$host_os" in
  (freebsd*)
         # This is only necessary if you are linking against an obsolete
  (freebsd*)
         # This is only necessary if you are linking against an obsolete
-       # version of ncurses (but it should do no harm, since it's static).
+       # version of ncurses (but it should do no harm, since it is static).
         if test "$cf_nculib_root" = ncurses ; then
                 AC_CHECK_LIB(mytinfo,tgoto,[cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"])
         fi
         if test "$cf_nculib_root" = ncurses ; then
                 AC_CHECK_LIB(mytinfo,tgoto,[cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"])
         fi
@@ -2748,7 +3029,7 @@ esac
  
  CF_ADD_LIBS($cf_ncurses_LIBS)
  
  
  CF_ADD_LIBS($cf_ncurses_LIBS)
  
-if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"
  then
         CF_ADD_LIBS(-l$cf_nculib_root)
  else
  then
         CF_ADD_LIBS(-l$cf_nculib_root)
  else
@@ -2762,13 +3043,13 @@ if test -n "$cf_ncurses_LIBS" ; then
         AC_MSG_CHECKING(if we can link $cf_nculib_root without $cf_ncurses_LIBS)
         cf_ncurses_SAVE="$LIBS"
         for p in $cf_ncurses_LIBS ; do
         AC_MSG_CHECKING(if we can link $cf_nculib_root without $cf_ncurses_LIBS)
         cf_ncurses_SAVE="$LIBS"
         for p in $cf_ncurses_LIBS ; do
-               q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
+               q=`echo "$LIBS" | sed -e "s%$p %%" -e "s%$p$%%"`
                 if test "$q" != "$LIBS" ; then
                         LIBS="$q"
                 fi
         done
         AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
                 if test "$q" != "$LIBS" ; then
                         LIBS="$q"
                 fi
         done
         AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
-               [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
+               [initscr(); mousemask(0,0); tigetstr((char *)0);],
                 [AC_MSG_RESULT(yes)],
                 [AC_MSG_RESULT(no)
                  LIBS="$cf_ncurses_SAVE"])
                 [AC_MSG_RESULT(yes)],
                 [AC_MSG_RESULT(no)
                  LIBS="$cf_ncurses_SAVE"])
@@ -2793,7 +3074,7 @@ then
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_VERSION version: 15 updated: 2017/05/09 19:26:10
+dnl CF_NCURSES_VERSION version: 18 updated: 2024/01/07 06:34:16
  dnl ------------------
  dnl Check for the version of ncurses, to aid in reporting bugs, etc.
  dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use
  dnl ------------------
  dnl Check for the version of ncurses, to aid in reporting bugs, etc.
  dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use
@@ -2804,24 +3085,26 @@ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
  AC_CACHE_CHECK(for ncurses version, cf_cv_ncurses_version,[
         cf_cv_ncurses_version=no
         cf_tempfile=out$$
  AC_CACHE_CHECK(for ncurses version, cf_cv_ncurses_version,[
         cf_cv_ncurses_version=no
         cf_tempfile=out$$
-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"
         AC_TRY_RUN([
         AC_TRY_RUN([
+$ac_includes_default
+
  #include <${cf_cv_ncurses_header:-curses.h}>
  #include <${cf_cv_ncurses_header:-curses.h}>
-#include <stdio.h>
+
  int main(void)
  {
         FILE *fp = fopen("$cf_tempfile", "w");
  #ifdef NCURSES_VERSION
  # ifdef NCURSES_VERSION_PATCH
  int main(void)
  {
         FILE *fp = fopen("$cf_tempfile", "w");
  #ifdef NCURSES_VERSION
  # ifdef NCURSES_VERSION_PATCH
-       fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);
+       fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);
  # else
  # else
-       fprintf(fp, "%s\n", NCURSES_VERSION);
+       fprintf(fp, "%s\\n", NCURSES_VERSION);
  # endif
  #else
  # ifdef __NCURSES_H
  # endif
  #else
  # ifdef __NCURSES_H
-       fprintf(fp, "old\n");
+       fprintf(fp, "old\\n");
  # else
  # else
-       make an error
+       #error expected ncurses header to define __NCURSES_H
  # endif
  #endif
         ${cf_cv_main_return:-return}(0);
  # endif
  #endif
         ${cf_cv_main_return:-return}(0);
@@ -2830,7 +3113,7 @@ int main(void)
  
         # This will not work if the preprocessor splits the line after the
         # Autoconf token.  The 'unproto' program does that.
  
         # This will not work if the preprocessor splits the line after the
         # Autoconf token.  The 'unproto' program does that.
-       cat > conftest.$ac_ext <<EOF
+       cat > "conftest.$ac_ext" <<EOF
  #include <${cf_cv_ncurses_header:-curses.h}>
  #undef Autoconf
  #ifdef NCURSES_VERSION
  #include <${cf_cv_ncurses_header:-curses.h}>
  #undef Autoconf
  #ifdef NCURSES_VERSION
@@ -2845,12 +3128,12 @@ EOF
         cf_try="$ac_cpp conftest.$ac_ext 2>&AC_FD_CC | grep '^Autoconf ' >conftest.out"
         AC_TRY_EVAL(cf_try)
         if test -f conftest.out ; then
         cf_try="$ac_cpp conftest.$ac_ext 2>&AC_FD_CC | grep '^Autoconf ' >conftest.out"
         AC_TRY_EVAL(cf_try)
         if test -f conftest.out ; then
-               cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[[^"]]*"%%' -e 's%".*%%'`
+               cf_out=`sed -e 's%^Autoconf %%' -e 's%^[[^"]]*"%%' -e 's%".*%%' conftest.out`
                 test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                 rm -f conftest.out
         fi
  ])
                 test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                 rm -f conftest.out
         fi
  ])
-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"
  ])
  test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
  ])dnl
  ])
  test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
  ])dnl
@@ -2910,23 +3193,33 @@ AC_TRY_COMPILE([
  test "$cf_cv_netbsd_menu_h" = yes && AC_DEFINE(HAVE_NETBSD_MENU_H,1,[Define to 1 if we appear to be using NetBSD menu.h])
  ])dnl
  dnl ---------------------------------------------------------------------------
  test "$cf_cv_netbsd_menu_h" = yes && AC_DEFINE(HAVE_NETBSD_MENU_H,1,[Define to 1 if we appear to be using NetBSD menu.h])
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_NO_LEAKS_OPTION version: 6 updated: 2015/04/12 15:39:00
+dnl CF_NO_LEAKS_OPTION version: 9 updated: 2021/06/13 19:45:41
  dnl ------------------
  dnl see CF_WITH_NO_LEAKS
  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_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
  ])
          $4
  ])
-       : ${with_cflags:=-g}
-       : ${with_no_leaks:=yes}
-        with_$1=yes],
+               ;;
+       esac],
         [with_$1=])
  AC_MSG_RESULT(${with_$1:-no})
  
         [with_$1=])
  AC_MSG_RESULT(${with_$1:-no})
  
-case .$with_cflags in
+case ".$with_cflags" in
  (.*-g*)
         case .$CFLAGS in
         (.*-g*)
  (.*-g*)
         case .$CFLAGS in
         (.*-g*)
@@ -2939,7 +3232,7 @@ case .$with_cflags in
  esac
  ])dnl
  dnl ---------------------------------------------------------------------------
  esac
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_PATH_SYNTAX version: 16 updated: 2015/04/18 08:56:57
+dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20
  dnl --------------
  dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
  dnl begins with one of the prefix/exec_prefix variables, and then again if the
  dnl --------------
  dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
  dnl begins with one of the prefix/exec_prefix variables, and then again if the
@@ -2959,16 +3252,16 @@ case ".[$]$1" in
         ;;
  (.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
         ;;
         ;;
  (.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
         ;;
-(.\[$]{*prefix}*|.\[$]{*dir}*)
+(.\[$]\{*prefix\}*|.\[$]\{*dir\}*)
         eval $1="[$]$1"
         case ".[$]$1" in
         (.NONE/*)
         eval $1="[$]$1"
         case ".[$]$1" in
         (.NONE/*)
-               $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
+               $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
                 ;;
         esac
         ;;
  (.no|.NONE/*)
                 ;;
         esac
         ;;
  (.no|.NONE/*)
-       $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
+       $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
         ;;
  (*)
         ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2)
         ;;
  (*)
         ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2)
@@ -2976,7 +3269,7 @@ case ".[$]$1" in
  esac
  ])dnl
  dnl ---------------------------------------------------------------------------
  esac
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_PDCURSES_X11 version: 14 updated: 2018/06/20 20:23:13
+dnl CF_PDCURSES_X11 version: 15 updated: 2021/01/02 09:31:20
  dnl ---------------
  dnl Configure for PDCurses' X11 library
  AC_DEFUN([CF_PDCURSES_X11],[
  dnl ---------------
  dnl Configure for PDCurses' X11 library
  AC_DEFUN([CF_PDCURSES_X11],[
@@ -3012,7 +3305,7 @@ char *XCursesProgramName = "test";
  
  fi
  
  
  fi
  
-if test $cf_cv_lib_XCurses = yes ; then
+if test "$cf_cv_lib_XCurses" = yes ; then
         AC_DEFINE(UNIX,1,[Define to 1 if using PDCurses on Unix])
         AC_DEFINE(XCURSES,1,[Define to 1 if using PDCurses on Unix])
         AC_CHECK_HEADER(xcurses.h, AC_DEFINE(HAVE_XCURSES,1,[Define to 1 if using PDCurses on Unix]))
         AC_DEFINE(UNIX,1,[Define to 1 if using PDCurses on Unix])
         AC_DEFINE(XCURSES,1,[Define to 1 if using PDCurses on Unix])
         AC_CHECK_HEADER(xcurses.h, AC_DEFINE(HAVE_XCURSES,1,[Define to 1 if using PDCurses on Unix]))
@@ -3021,19 +3314,21 @@ else
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_PKG_CONFIG version: 10 updated: 2015/04/26 18:06:58
+dnl CF_PKG_CONFIG version: 13 updated: 2023/10/28 11:59:01
  dnl -------------
  dnl Check for the package-config program, unless disabled by command-line.
  dnl -------------
  dnl Check for the package-config program, unless disabled by command-line.
+dnl
+dnl Sets $PKG_CONFIG to the pathname of the pkg-config program.
  AC_DEFUN([CF_PKG_CONFIG],
  [
  AC_MSG_CHECKING(if you want to use pkg-config)
  AC_ARG_WITH(pkg-config,
  AC_DEFUN([CF_PKG_CONFIG],
  [
  AC_MSG_CHECKING(if you want to use pkg-config)
  AC_ARG_WITH(pkg-config,
-       [  --with-pkg-config{=path} enable/disable use of pkg-config],
+       [[  --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD]],
         [cf_pkg_config=$withval],
         [cf_pkg_config=yes])
  AC_MSG_RESULT($cf_pkg_config)
  
         [cf_pkg_config=$withval],
         [cf_pkg_config=yes])
  AC_MSG_RESULT($cf_pkg_config)
  
-case $cf_pkg_config in
+case "$cf_pkg_config" in
  (no)
         PKG_CONFIG=none
         ;;
  (no)
         PKG_CONFIG=none
         ;;
@@ -3057,7 +3352,7 @@ fi
  AC_SUBST(PKG_CONFIG)
  ])dnl
  dnl ---------------------------------------------------------------------------
  AC_SUBST(PKG_CONFIG)
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_POSIX_C_SOURCE version: 11 updated: 2018/12/31 20:46:17
+dnl CF_POSIX_C_SOURCE version: 12 updated: 2023/02/18 17:41:25
  dnl -----------------
  dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
  dnl
  dnl -----------------
  dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
  dnl
@@ -3088,7 +3383,7 @@ AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[
         CF_MSG_LOG(if the symbol is already defined go no further)
         AC_TRY_COMPILE([#include <sys/types.h>],[
  #ifndef _POSIX_C_SOURCE
         CF_MSG_LOG(if the symbol is already defined go no further)
         AC_TRY_COMPILE([#include <sys/types.h>],[
  #ifndef _POSIX_C_SOURCE
-make an error
+#error _POSIX_C_SOURCE is not defined
  #endif],
         [cf_cv_posix_c_source=no],
         [cf_want_posix_source=no
  #endif],
         [cf_cv_posix_c_source=no],
         [cf_want_posix_source=no
@@ -3107,7 +3402,7 @@ make an error
          if test "$cf_want_posix_source" = yes ; then
                 AC_TRY_COMPILE([#include <sys/types.h>],[
  #ifdef _POSIX_SOURCE
          if test "$cf_want_posix_source" = yes ; then
                 AC_TRY_COMPILE([#include <sys/types.h>],[
  #ifdef _POSIX_SOURCE
-make an error
+#error _POSIX_SOURCE is defined
  #endif],[],
                 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE")
          fi
  #endif],[],
                 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE")
          fi
@@ -3118,7 +3413,7 @@ make an error
          CF_MSG_LOG(if the second compile does not leave our definition intact error)
          AC_TRY_COMPILE([#include <sys/types.h>],[
  #ifndef _POSIX_C_SOURCE
          CF_MSG_LOG(if the second compile does not leave our definition intact error)
          AC_TRY_COMPILE([#include <sys/types.h>],[
  #ifndef _POSIX_C_SOURCE
-make an error
+#error _POSIX_C_SOURCE is not defined
  #endif],,
          [cf_cv_posix_c_source=no])
          CFLAGS="$cf_save_CFLAGS"
  #endif],,
          [cf_cv_posix_c_source=no])
          CFLAGS="$cf_save_CFLAGS"
@@ -3163,7 +3458,7 @@ AC_TRY_COMPILE([#include <stdio.h>],[
  ])
  ])dnl
  dnl ---------------------------------------------------------------------------
  ])
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_PRG_RULES version: 1 updated: 2006/06/03 11:45:08
+dnl CF_PRG_RULES version: 2 updated: 2021/01/01 13:31:04
  dnl ------------
  dnl Append definitions and rules for the given programs to the subdirectory
  dnl Makefiles, and the recursion rule for the top-level Makefile.
  dnl ------------
  dnl Append definitions and rules for the given programs to the subdirectory
  dnl Makefiles, and the recursion rule for the top-level Makefile.
@@ -3178,10 +3473,10 @@ AC_DEFUN([CF_PRG_RULES],
  [
  for cf_dir in $2
  do
  [
  for cf_dir in $2
  do
-       if test ! -d $srcdir/$cf_dir; then
+       if test ! -d "$srcdir/$cf_dir" ; then
                 continue
                 continue
-       elif test -f $srcdir/$cf_dir/programs; then
-               $AWK -f $1 $srcdir/$cf_dir/programs >>$cf_dir/Makefile
+       elif test -f "$srcdir/$cf_dir/programs" ; then
+               $AWK -f $1 "$srcdir/$cf_dir/programs" >>$cf_dir/Makefile
         fi
  done
  
         fi
  done
  
@@ -3204,7 +3499,7 @@ CF_ACVERSION_CHECK(2.52,
  CF_CC_ENV_FLAGS
  ])dnl
  dnl ---------------------------------------------------------------------------
  CF_CC_ENV_FLAGS
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_PROG_INSTALL version: 7 updated: 2015/04/18 08:56:57
+dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05
  dnl ---------------
  dnl Force $INSTALL to be an absolute-path.  Otherwise, edit_man.sh and the
  dnl misc/tabset install won't work properly.  Usually this happens only when
  dnl ---------------
  dnl Force $INSTALL to be an absolute-path.  Otherwise, edit_man.sh and the
  dnl misc/tabset install won't work properly.  Usually this happens only when
@@ -3217,12 +3512,12 @@ case $INSTALL in
  (*)
         CF_DIRNAME(cf_dir,$INSTALL)
         test -z "$cf_dir" && cf_dir=.
  (*)
         CF_DIRNAME(cf_dir,$INSTALL)
         test -z "$cf_dir" && cf_dir=.
-       INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's%^.*/%%'`
+       INSTALL="`cd \"$cf_dir\" && pwd`"/"`echo "$INSTALL" | sed -e 's%^.*/%%'`"
         ;;
  esac
  ])dnl
  dnl ---------------------------------------------------------------------------
         ;;
  esac
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_PROG_LINT version: 4 updated: 2019/11/20 18:55:37
+dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13
  dnl ------------
  AC_DEFUN([CF_PROG_LINT],
  [
  dnl ------------
  AC_DEFUN([CF_PROG_LINT],
  [
@@ -3233,6 +3528,25 @@ case "x$LINT" in
         ;;
  esac
  AC_SUBST(LINT_OPTS)
         ;;
  esac
  AC_SUBST(LINT_OPTS)
+AC_SUBST(LINT_LIBS)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_REMOVE_CFLAGS version: 3 updated: 2021/09/05 17:25:40
+dnl ----------------
+dnl Remove a given option from CFLAGS/CPPFLAGS
+dnl $1 = option to remove
+dnl $2 = variable to update
+dnl $3 = nonempty to allow verbose message
+define([CF_REMOVE_CFLAGS],
+[
+cf_tmp_cflag=`echo "x$1" | sed -e 's/^.//' -e 's/=.*//'`
+while true
+do
+       cf_old_cflag=`echo "x[$]$2" | sed -e 's/^.//' -e 's/[[  ]][[    ]]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[[^   ]][[^   ]]*\\)\?%%" -e 's/^[[   ]]*//' -e 's%[[ ]][[ ]]*-D% -D%g' -e 's%[[ ]][[ ]]*-I% -I%g'`
+       test "[$]$2" != "$cf_old_cflag" || break
+       ifelse([$3],,,[CF_VERBOSE(removing old option $1 from $2)])
+       $2="$cf_old_cflag"
+done
  ])dnl
  dnl ---------------------------------------------------------------------------
  dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50
  ])dnl
  dnl ---------------------------------------------------------------------------
  dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50
@@ -3263,11 +3577,12 @@ CFLAGS="$cf_save_CFLAGS_$1"
  CPPFLAGS="$cf_save_CPPFLAGS_$1"
  ])dnl
  dnl ---------------------------------------------------------------------------
  CPPFLAGS="$cf_save_CPPFLAGS_$1"
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_RPATH_HACK version: 11 updated: 2013/09/01 13:02:00
+dnl CF_RPATH_HACK version: 13 updated: 2021/01/03 18:30:50
  dnl -------------
  AC_DEFUN([CF_RPATH_HACK],
  dnl -------------
  AC_DEFUN([CF_RPATH_HACK],
-[
-AC_REQUIRE([CF_LD_RPATH_OPT])
+[AC_REQUIRE([AC_PROG_FGREP])dnl
+AC_REQUIRE([CF_LD_RPATH_OPT])dnl
+
  AC_MSG_CHECKING(for updated LDFLAGS)
  if test -n "$LD_RPATH_OPT" ; then
         AC_MSG_RESULT(maybe)
  AC_MSG_CHECKING(for updated LDFLAGS)
  if test -n "$LD_RPATH_OPT" ; then
         AC_MSG_RESULT(maybe)
@@ -3280,8 +3595,8 @@ if test -n "$LD_RPATH_OPT" ; then
  
  AC_TRY_LINK([#include <stdio.h>],
                 [printf("Hello");],
  
  AC_TRY_LINK([#include <stdio.h>],
                 [printf("Hello");],
-               [cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
-                cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[     ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort | uniq`])
+               [cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+                cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[[        ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort | uniq`])
  
                 # If we passed the link-test, but get a "not found" on a given library,
                 # this could be due to inept reconfiguration of gcc to make it only
  
                 # If we passed the link-test, but get a "not found" on a given library,
                 # this could be due to inept reconfiguration of gcc to make it only
@@ -3297,7 +3612,7 @@ AC_TRY_LINK([#include <stdio.h>],
                                         /usr/pkg \
                                         /opt/sfw
                                 do
                                         /usr/pkg \
                                         /opt/sfw
                                 do
-                                       if test -f $cf_rpath_dir/lib/$cf_rpath_src
+                                       if test -f "$cf_rpath_dir/lib/$cf_rpath_src"
                                         then
                                                 CF_VERBOSE(...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src)
                                                 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
                                         then
                                                 CF_VERBOSE(...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src)
                                                 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
@@ -3320,7 +3635,7 @@ fi
  AC_SUBST(EXTRA_LDFLAGS)
  ])dnl
  dnl ---------------------------------------------------------------------------
  AC_SUBST(EXTRA_LDFLAGS)
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_RPATH_HACK_2 version: 7 updated: 2015/04/12 15:39:00
+dnl CF_RPATH_HACK_2 version: 8 updated: 2021/01/01 13:31:04
  dnl ---------------
  dnl Do one set of substitutions for CF_RPATH_HACK, adding an rpath option to
  dnl EXTRA_LDFLAGS for each -L option found.
  dnl ---------------
  dnl Do one set of substitutions for CF_RPATH_HACK, adding an rpath option to
  dnl EXTRA_LDFLAGS for each -L option found.
@@ -3336,7 +3651,7 @@ CF_VERBOSE(...checking $1 [$]$1)
  cf_rpath_dst=
  for cf_rpath_src in [$]$1
  do
  cf_rpath_dst=
  for cf_rpath_src in [$]$1
  do
-       case $cf_rpath_src in
+       case "$cf_rpath_src" in
         (-L*)
  
                 # check if this refers to a directory which we will ignore
         (-L*)
  
                 # check if this refers to a directory which we will ignore
@@ -3405,7 +3720,7 @@ do
  done
  ])dnl
  dnl ---------------------------------------------------------------------------
  done
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_SIGWINCH version: 3 updated: 2020/03/10 18:53:47
+dnl CF_SIGWINCH version: 7 updated: 2023/02/18 17:41:25
  dnl -----------
  dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all
  dnl programs need this test).
  dnl -----------
  dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all
  dnl programs need this test).
@@ -3438,7 +3753,7 @@ if test "$cf_cv_define_sigwinch" = maybe ; then
  AC_CACHE_CHECK(for actual SIGWINCH definition,cf_cv_fixup_sigwinch,[
  cf_cv_fixup_sigwinch=unknown
  cf_sigwinch=32
  AC_CACHE_CHECK(for actual SIGWINCH definition,cf_cv_fixup_sigwinch,[
  cf_cv_fixup_sigwinch=unknown
  cf_sigwinch=32
-while test $cf_sigwinch != 1
+while test "$cf_sigwinch" != 1
  do
         AC_TRY_COMPILE([
  #undef _XOPEN_SOURCE
  do
         AC_TRY_COMPILE([
  #undef _XOPEN_SOURCE
@@ -3448,13 +3763,13 @@ do
  #include <sys/signal.h>
  ],[
  #if SIGWINCH != $cf_sigwinch
  #include <sys/signal.h>
  ],[
  #if SIGWINCH != $cf_sigwinch
-make an error
+#error SIGWINCH is not $cf_sigwinch
  #endif
  int x = SIGWINCH; (void)x],
         [cf_cv_fixup_sigwinch=$cf_sigwinch
          break])
  
  #endif
  int x = SIGWINCH; (void)x],
         [cf_cv_fixup_sigwinch=$cf_sigwinch
          break])
  
-cf_sigwinch=`expr $cf_sigwinch - 1`
+cf_sigwinch="`expr "$cf_sigwinch" - 1`"
  done
  ])
  
  done
  ])
  
@@ -3547,14 +3862,14 @@ AC_MSG_RESULT($cf_cv_sys_time_select)
  test "$cf_cv_sys_time_select" = yes && AC_DEFINE(HAVE_SYS_TIME_SELECT,1,[Define to 1 if we can include <sys/time.h> with <sys/select.h>])
  ])dnl
  dnl ---------------------------------------------------------------------------
  test "$cf_cv_sys_time_select" = yes && AC_DEFINE(HAVE_SYS_TIME_SELECT,1,[Define to 1 if we can include <sys/time.h> with <sys/select.h>])
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_TERM_HEADER version: 5 updated: 2020/03/19 20:23:48
+dnl CF_TERM_HEADER version: 6 updated: 2021/01/02 09:31:20
  dnl --------------
  dnl Look for term.h, which is part of X/Open curses.  It defines the interface
  dnl to terminfo database.  Usually it is in the same include-path as curses.h,
  dnl but some packagers change this, breaking various applications.
  AC_DEFUN([CF_TERM_HEADER],[
  AC_CACHE_CHECK(for terminfo header, cf_cv_term_header,[
  dnl --------------
  dnl Look for term.h, which is part of X/Open curses.  It defines the interface
  dnl to terminfo database.  Usually it is in the same include-path as curses.h,
  dnl but some packagers change this, breaking various applications.
  AC_DEFUN([CF_TERM_HEADER],[
  AC_CACHE_CHECK(for terminfo header, cf_cv_term_header,[
-case ${cf_cv_ncurses_header} in
+case "${cf_cv_ncurses_header}" in
  (*/ncurses.h|*/ncursesw.h)
         cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[[^.]]*\.h$%term.h%'`
         ;;
  (*/ncurses.h|*/ncursesw.h)
         cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[[^.]]*\.h$%term.h%'`
         ;;
@@ -3578,13 +3893,13 @@ done
  
  # Set definitions to allow ifdef'ing to accommodate subdirectories
  
  
  # Set definitions to allow ifdef'ing to accommodate subdirectories
  
-case $cf_cv_term_header in
+case "$cf_cv_term_header" in
  (*term.h)
         AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h])
         ;;
  esac
  
  (*term.h)
         AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h])
         ;;
  esac
  
-case $cf_cv_term_header in
+case "$cf_cv_term_header" in
  (ncurses/term.h)
         AC_DEFINE(HAVE_NCURSES_TERM_H,1,[Define to 1 if we have ncurses/term.h])
         ;;
  (ncurses/term.h)
         AC_DEFINE(HAVE_NCURSES_TERM_H,1,[Define to 1 if we have ncurses/term.h])
         ;;
@@ -3603,21 +3918,21 @@ top_builddir=ifelse($1,,`pwd`,$1)
  AC_SUBST(top_builddir)
  ])dnl
  dnl ---------------------------------------------------------------------------
  AC_SUBST(top_builddir)
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_TPUTS_PROTO version: 3 updated: 2015/04/17 21:26:14
+dnl CF_TPUTS_PROTO version: 4 updated: 2021/01/04 19:45:09
  dnl --------------
  dnl Check for type of function-pointer passed to tputs.  Some old
  dnl implementations used functions that had different prototypes, making it
  dnl hard to compile portable programs using tputs.
  AC_DEFUN([CF_TPUTS_PROTO],[
  CF_CURSES_FUNCS(tputs)
  dnl --------------
  dnl Check for type of function-pointer passed to tputs.  Some old
  dnl implementations used functions that had different prototypes, making it
  dnl hard to compile portable programs using tputs.
  AC_DEFUN([CF_TPUTS_PROTO],[
  CF_CURSES_FUNCS(tputs)
-if test x$cf_cv_func_tputs = xyes
+if test "x$cf_cv_func_tputs" = xyes
  then
         cf_done=no
         for cf_arg in int char
         do
                 for cf_ret in int void
                 do
  then
         cf_done=no
         for cf_arg in int char
         do
                 for cf_ret in int void
                 do
-                       if test $cf_ret = void
+                       if test "$cf_ret" = void
                         then
                                 cf_return="/* nothing */"
                         else
                         then
                                 cf_return="/* nothing */"
                         else
@@ -3642,7 +3957,7 @@ EOF
                 break
  ])
                 done
                 break
  ])
                 done
-               test $cf_done = yes && break
+               test "$cf_done" = yes && break
         done
  fi
  ])dnl
         done
  fi
  ])dnl
@@ -3663,21 +3978,21 @@ AC_DEFUN([CF_TRIM_X_LIBS],[
         done
  ])
  dnl ---------------------------------------------------------------------------
         done
  ])
  dnl ---------------------------------------------------------------------------
-dnl CF_TRY_PKG_CONFIG version: 5 updated: 2013/07/06 21:27:06
+dnl CF_TRY_PKG_CONFIG version: 6 updated: 2020/12/31 10:54:15
  dnl -----------------
  dnl This is a simple wrapper to use for pkg-config, for libraries which may be
  dnl available in that form.
  dnl
  dnl -----------------
  dnl This is a simple wrapper to use for pkg-config, for libraries which may be
  dnl available in that form.
  dnl
-dnl $1 = package name
+dnl $1 = package name, which may be a shell variable
  dnl $2 = extra logic to use, if any, after updating CFLAGS and LIBS
  dnl $3 = logic to use if pkg-config does not have the package
  AC_DEFUN([CF_TRY_PKG_CONFIG],[
  AC_REQUIRE([CF_PKG_CONFIG])
  
  dnl $2 = extra logic to use, if any, after updating CFLAGS and LIBS
  dnl $3 = logic to use if pkg-config does not have the package
  AC_DEFUN([CF_TRY_PKG_CONFIG],[
  AC_REQUIRE([CF_PKG_CONFIG])
  
-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $1; then
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$1"; then
         CF_VERBOSE(found package $1)
         CF_VERBOSE(found package $1)
-       cf_pkgconfig_incs="`$PKG_CONFIG --cflags $1 2>/dev/null`"
-       cf_pkgconfig_libs="`$PKG_CONFIG --libs   $1 2>/dev/null`"
+       cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$1" 2>/dev/null`"
+       cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$1" 2>/dev/null`"
         CF_VERBOSE(package $1 CFLAGS: $cf_pkgconfig_incs)
         CF_VERBOSE(package $1 LIBS: $cf_pkgconfig_libs)
         CF_ADD_CFLAGS($cf_pkgconfig_incs)
         CF_VERBOSE(package $1 CFLAGS: $cf_pkgconfig_incs)
         CF_VERBOSE(package $1 LIBS: $cf_pkgconfig_libs)
         CF_ADD_CFLAGS($cf_pkgconfig_incs)
@@ -3690,34 +4005,20 @@ else
  fi
  ])
  dnl ---------------------------------------------------------------------------
  fi
  ])
  dnl ---------------------------------------------------------------------------
-dnl CF_TRY_XOPEN_SOURCE version: 2 updated: 2018/06/20 20:23:13
+dnl CF_TRY_XOPEN_SOURCE version: 4 updated: 2022/09/10 15:16:16
  dnl -------------------
  dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we
  dnl can define it successfully.
  AC_DEFUN([CF_TRY_XOPEN_SOURCE],[
  AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
  dnl -------------------
  dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we
  dnl can define it successfully.
  AC_DEFUN([CF_TRY_XOPEN_SOURCE],[
  AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
-       AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-],[
-#ifndef _XOPEN_SOURCE
-make an error
-#endif],
+       AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,
         [cf_cv_xopen_source=no],
         [cf_save="$CPPFLAGS"
          CF_APPEND_TEXT(CPPFLAGS,-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE)
         [cf_cv_xopen_source=no],
         [cf_save="$CPPFLAGS"
          CF_APPEND_TEXT(CPPFLAGS,-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE)
-        AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-],[
-#ifdef _XOPEN_SOURCE
-make an error
-#endif],
-       [cf_cv_xopen_source=no],
-       [cf_cv_xopen_source=$cf_XOPEN_SOURCE])
-       CPPFLAGS="$cf_save"
+        AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,
+               [cf_cv_xopen_source=no],
+               [cf_cv_xopen_source=$cf_XOPEN_SOURCE])
+               CPPFLAGS="$cf_save"
         ])
  ])
  
         ])
  ])
  
@@ -3725,7 +4026,7 @@ if test "$cf_cv_xopen_source" != no ; then
         CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
         CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
         cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
         CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
         CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
         cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
-       CF_ADD_CFLAGS($cf_temp_xopen_source)
+       CF_APPEND_CFLAGS($cf_temp_xopen_source)
  fi
  ])
  dnl ---------------------------------------------------------------------------
  fi
  ])
  dnl ---------------------------------------------------------------------------
@@ -3738,15 +4039,20 @@ AC_DEFUN([CF_UPPER],
  $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
  ])dnl
  dnl ---------------------------------------------------------------------------
  $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_UTF8_LIB version: 8 updated: 2012/10/06 08:57:51
+dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23
  dnl -----------
  dnl Check for multibyte support, and if not found, utf8 compatibility library
  AC_DEFUN([CF_UTF8_LIB],
  [
  dnl -----------
  dnl Check for multibyte support, and if not found, utf8 compatibility library
  AC_DEFUN([CF_UTF8_LIB],
  [
+AC_HAVE_HEADERS(wchar.h)
  AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
         cf_save_LIBS="$LIBS"
         AC_TRY_LINK([
  AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
         cf_save_LIBS="$LIBS"
         AC_TRY_LINK([
-#include <stdlib.h>],[putwc(0,0);],
+$ac_includes_default
+#ifdef HAVE_WCHAR_H
+#include <wchar.h>
+#endif
+],[putwc(0,0);],
         [cf_cv_utf8_lib=yes],
         [CF_FIND_LINKAGE([
  #include <libutf8.h>],[putwc(0,0);],utf8,
         [cf_cv_utf8_lib=yes],
         [CF_FIND_LINKAGE([
  #include <libutf8.h>],[putwc(0,0);],utf8,
@@ -3772,7 +4078,7 @@ AC_DEFUN([CF_VERBOSE],
  CF_MSG_LOG([$1])
  ])dnl
  dnl ---------------------------------------------------------------------------
  CF_MSG_LOG([$1])
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_WCHAR_TYPE version: 4 updated: 2012/10/06 16:39:58
+dnl CF_WCHAR_TYPE version: 5 updated: 2023/12/03 09:21:34
  dnl -------------
  dnl Check if type wide-character type $1 is declared, and if so, which header
  dnl file is needed.  The second parameter is used to set a shell variable when
  dnl -------------
  dnl Check if type wide-character type $1 is declared, and if so, which header
  dnl file is needed.  The second parameter is used to set a shell variable when
@@ -3789,7 +4095,7 @@ AC_TRY_COMPILE([
  #ifdef HAVE_LIBUTF8_H
  #include <libutf8.h>
  #endif],
  #ifdef HAVE_LIBUTF8_H
  #include <libutf8.h>
  #endif],
-       [$1 state],
+       [$1 state; (void)state],
         [cf_cv_$1=no],
         [AC_TRY_COMPILE([
  #include <stdlib.h>
         [cf_cv_$1=no],
         [AC_TRY_COMPILE([
  #include <stdlib.h>
@@ -3799,7 +4105,7 @@ AC_TRY_COMPILE([
  #ifdef HAVE_LIBUTF8_H
  #include <libutf8.h>
  #endif],
  #ifdef HAVE_LIBUTF8_H
  #include <libutf8.h>
  #endif],
-       [$1 value],
+       [$1 value; (void) value],
         [cf_cv_$1=yes],
         [cf_cv_$1=unknown])])])
  
         [cf_cv_$1=yes],
         [cf_cv_$1=unknown])])])
  
@@ -3822,7 +4128,7 @@ fi
  ])
  ])dnl
  dnl ---------------------------------------------------------------------------
  ])
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_WITH_CURSES_DIR version: 3 updated: 2010/11/20 17:02:38
+dnl CF_WITH_CURSES_DIR version: 4 updated: 2021/01/02 19:22:58
  dnl ------------------
  dnl Wrapper for AC_ARG_WITH to specify directory under which to look for curses
  dnl libraries.
  dnl ------------------
  dnl Wrapper for AC_ARG_WITH to specify directory under which to look for curses
  dnl libraries.
@@ -3835,7 +4141,7 @@ AC_ARG_WITH(curses-dir,
         [cf_cv_curses_dir=no])
  AC_MSG_RESULT($cf_cv_curses_dir)
  
         [cf_cv_curses_dir=no])
  AC_MSG_RESULT($cf_cv_curses_dir)
  
-if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"
  then
         CF_PATH_SYNTAX(withval)
         if test -d "$cf_cv_curses_dir"
  then
         CF_PATH_SYNTAX(withval)
         if test -d "$cf_cv_curses_dir"
@@ -3876,7 +4182,7 @@ if test "$with_dmalloc" = yes ; then
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_WITH_LIB_BASENAME version: 1 updated: 2020/03/07 20:05:14
+dnl CF_WITH_LIB_BASENAME version: 2 updated: 2023/11/22 20:48:30
  dnl --------------------
  dnl Allow for overriding the basename of a library, i.e., the part to which
  dnl prefixes/suffixes are attached.
  dnl --------------------
  dnl Allow for overriding the basename of a library, i.e., the part to which
  dnl prefixes/suffixes are attached.
@@ -3888,7 +4194,7 @@ AC_DEFUN([CF_WITH_LIB_BASENAME],
  [
  AC_MSG_CHECKING(for desired basename for $2 library)
  AC_ARG_WITH($2-libname,
  [
  AC_MSG_CHECKING(for desired basename for $2 library)
  AC_ARG_WITH($2-libname,
-       [  --with-$2-libname=XXX override ifelse($3,,$2,$3) basename of library],
+       [[  --with-$2-libname[=XXX] override ifelse($3,,$2,$3) basename of library]],
         [with_lib_basename=$withval],
         [with_lib_basename=ifelse($3,,$2,$3)])
  $1="$with_lib_basename"
         [with_lib_basename=$withval],
         [with_lib_basename=ifelse($3,,$2,$3)])
  $1="$with_lib_basename"
@@ -3905,7 +4211,7 @@ AC_MSG_RESULT([$]$1)
  AC_SUBST($1)
  ])dnl
  dnl ---------------------------------------------------------------------------
  AC_SUBST($1)
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_WITH_NCURSES_ETC version: 5 updated: 2016/02/20 19:23:20
+dnl CF_WITH_NCURSES_ETC version: 6 updated: 2023/01/16 10:10:06
  dnl -------------------
  dnl Use this macro for programs which use any variant of "curses", e.g.,
  dnl "ncurses", and "PDCurses".  Programs that can use curses and some unrelated
  dnl -------------------
  dnl Use this macro for programs which use any variant of "curses", e.g.,
  dnl "ncurses", and "PDCurses".  Programs that can use curses and some unrelated
@@ -3965,6 +4271,7 @@ case $cf_cv_screen in
  esac
  
  CF_NCURSES_PTHREADS($cf_cv_screen)
  esac
  
  CF_NCURSES_PTHREADS($cf_cv_screen)
+AC_SUBST(cf_cv_screen)
  
  ])dnl
  dnl ---------------------------------------------------------------------------
  
  ])dnl
  dnl ---------------------------------------------------------------------------
@@ -3993,7 +4300,7 @@ CF_NO_LEAKS_OPTION(valgrind,
         [USE_VALGRIND])
  ])dnl
  dnl ---------------------------------------------------------------------------
         [USE_VALGRIND])
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_WITH_X11_RGB version: 2 updated: 2019/12/31 08:53:54
+dnl CF_WITH_X11_RGB version: 3 updated: 2023/10/28 11:59:01
  dnl ---------------
  dnl Handle configure option "--with-x11-rgb", setting these shell
  dnl variables:
  dnl ---------------
  dnl Handle configure option "--with-x11-rgb", setting these shell
  dnl variables:
@@ -4033,7 +4340,7 @@ dnl       /usr/X11/lib/X11/rgb.txt
  AC_DEFUN([CF_WITH_X11_RGB],[
  AC_MSG_CHECKING(for X11 rgb file)
  AC_ARG_WITH(x11-rgb,
  AC_DEFUN([CF_WITH_X11_RGB],[
  AC_MSG_CHECKING(for X11 rgb file)
  AC_ARG_WITH(x11-rgb,
-       [  --with-x11-rgb=FILE   file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt)],
+       [  --with-x11-rgb=FILE     obtain X11 color definitions from FILE (default: EPREFIX/lib/X11/rgb.txt)],
         [RGB_PATH=$withval],
         [RGB_PATH=auto])
  
         [RGB_PATH=$withval],
         [RGB_PATH=auto])
  
@@ -4079,7 +4386,7 @@ fi
  AC_SUBST(no_x11_rgb)
  ])dnl
  dnl ---------------------------------------------------------------------------
  AC_SUBST(no_x11_rgb)
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_CURSES version: 15 updated: 2020/03/19 20:23:48
+dnl CF_XOPEN_CURSES version: 20 updated: 2024/01/07 06:54:12
  dnl ---------------
  dnl Test if we should define X/Open source for curses, needed on Digital Unix
  dnl 4.x, to see the extended functions, but breaks on IRIX 6.x.
  dnl ---------------
  dnl Test if we should define X/Open source for curses, needed on Digital Unix
  dnl 4.x, to see the extended functions, but breaks on IRIX 6.x.
@@ -4092,22 +4399,22 @@ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
  AC_CACHE_CHECK(definition to turn on extended curses functions,cf_cv_need_xopen_extension,[
  cf_cv_need_xopen_extension=unknown
  AC_TRY_LINK([
  AC_CACHE_CHECK(definition to turn on extended curses functions,cf_cv_need_xopen_extension,[
  cf_cv_need_xopen_extension=unknown
  AC_TRY_LINK([
-#include <stdlib.h>
+$ac_includes_default
  #include <${cf_cv_ncurses_header:-curses.h}>],[
  #if defined(NCURSES_VERSION_PATCH)
  #if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
  #include <${cf_cv_ncurses_header:-curses.h}>],[
  #if defined(NCURSES_VERSION_PATCH)
  #if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
-       make an error
+       #error disallow ncurses versions between 2020/04/03 and 2010/05/01
  #endif
  #endif
  #endif
  #endif
-#ifdef NCURSES_VERSION
+#ifdef NCURSES_WIDECHAR
+#error prefer to fall-through on the second checks
+#endif
+       static char dummy[10];
         cchar_t check;
         int check2 = curs_set((int)sizeof(check));
         cchar_t check;
         int check2 = curs_set((int)sizeof(check));
-#endif
-       long x = winnstr(stdscr, "", 0);
+       long x = winnstr(stdscr, dummy, 5);
         int x1, y1;
         int x1, y1;
-#ifdef NCURSES_VERSION
         (void)check2;
         (void)check2;
-#endif
         getbegyx(stdscr, y1, x1);
         (void)x;
         (void)y1;
         getbegyx(stdscr, y1, x1);
         (void)x;
         (void)y1;
@@ -4119,18 +4426,15 @@ AC_TRY_LINK([
         do
                 AC_TRY_LINK([
  #define $cf_try_xopen_extension 1
         do
                 AC_TRY_LINK([
  #define $cf_try_xopen_extension 1
-#include <stdlib.h>
+$ac_includes_default
  #include <${cf_cv_ncurses_header:-curses.h}>],[
  #include <${cf_cv_ncurses_header:-curses.h}>],[
-#ifdef NCURSES_VERSION
+               static char dummy[10];
                 cchar_t check;
                 int check2 = curs_set((int)sizeof(check));
                 cchar_t check;
                 int check2 = curs_set((int)sizeof(check));
-#endif
-               long x = winnstr(stdscr, "", 0);
+               long x = winnstr(stdscr, dummy, 5);
                 int x1, y1;
                 getbegyx(stdscr, y1, x1);
                 int x1, y1;
                 getbegyx(stdscr, y1, x1);
-#ifdef NCURSES_VERSION
                 (void)check2;
                 (void)check2;
-#endif
                 (void)x;
                 (void)y1;
                 (void)x1;
                 (void)x;
                 (void)y1;
                 (void)x1;
@@ -4140,7 +4444,7 @@ AC_TRY_LINK([
         ])
  ])
  
         ])
  ])
  
-case $cf_cv_need_xopen_extension in
+case "$cf_cv_need_xopen_extension" in
  (*_*)
         CF_APPEND_TEXT(CPPFLAGS,-D$cf_cv_need_xopen_extension)
         ;;
  (*_*)
         CF_APPEND_TEXT(CPPFLAGS,-D$cf_cv_need_xopen_extension)
         ;;
@@ -4148,7 +4452,7 @@ esac
  
  ])dnl
  dnl ---------------------------------------------------------------------------
  
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 55 updated: 2018/12/31 20:46:17
+dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27
  dnl ---------------
  dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
  dnl or adapt to the vendor's definitions to get equivalent functionality,
  dnl ---------------
  dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
  dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -4157,6 +4461,18 @@ dnl
  dnl Parameters:
  dnl    $1 is the nominal value for _XOPEN_SOURCE
  dnl    $2 is the nominal value for _POSIX_C_SOURCE
  dnl Parameters:
  dnl    $1 is the nominal value for _XOPEN_SOURCE
  dnl    $2 is the nominal value for _POSIX_C_SOURCE
+dnl
+dnl The default case prefers _XOPEN_SOURCE over _POSIX_C_SOURCE if the
+dnl implementation predefines it, because X/Open and most implementations agree
+dnl that the latter is a legacy or "aligned" value.
+dnl
+dnl Because _XOPEN_SOURCE is preferred, if defining _POSIX_C_SOURCE turns
+dnl that off, then refrain from setting _POSIX_C_SOURCE explicitly.
+dnl
+dnl References:
+dnl https://pubs.opengroup.org/onlinepubs/007904975/functions/xsh_chap02_02.html
+dnl https://docs.oracle.com/cd/E19253-01/816-5175/standards-5/index.html
+dnl https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html
  AC_DEFUN([CF_XOPEN_SOURCE],[
  AC_REQUIRE([AC_CANONICAL_HOST])
  AC_REQUIRE([CF_POSIX_VISIBLE])
  AC_DEFUN([CF_XOPEN_SOURCE],[
  AC_REQUIRE([AC_CANONICAL_HOST])
  AC_REQUIRE([CF_POSIX_VISIBLE])
@@ -4167,13 +4483,10 @@ cf_XOPEN_SOURCE=ifelse([$1],,500,[$1])
  cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2])
  cf_xopen_source=
  
  cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2])
  cf_xopen_source=
  
-case $host_os in
+case "$host_os" in
  (aix[[4-7]]*)
         cf_xopen_source="-D_ALL_SOURCE"
         ;;
  (aix[[4-7]]*)
         cf_xopen_source="-D_ALL_SOURCE"
         ;;
-(msys)
-       cf_XOPEN_SOURCE=600
-       ;;
  (darwin[[0-8]].*)
         cf_xopen_source="-D_APPLE_C_SOURCE"
         ;;
  (darwin[[0-8]].*)
         cf_xopen_source="-D_APPLE_C_SOURCE"
         ;;
@@ -4199,7 +4512,7 @@ case $host_os in
         cf_xopen_source="-D_SGI_SOURCE"
         cf_XOPEN_SOURCE=
         ;;
         cf_xopen_source="-D_SGI_SOURCE"
         cf_XOPEN_SOURCE=
         ;;
-(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
         CF_GNU_SOURCE($cf_XOPEN_SOURCE)
         ;;
  (minix*)
         CF_GNU_SOURCE($cf_XOPEN_SOURCE)
         ;;
  (minix*)
@@ -4213,7 +4526,15 @@ case $host_os in
  (netbsd*)
         cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
         ;;
  (netbsd*)
         cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
         ;;
-(openbsd[[4-9]]*)
+(openbsd[[6-9]]*)
+       # OpenBSD 6.x has broken locale support, both compile-time and runtime.
+       # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
+       # Abusing the conformance level is a workaround.
+       AC_MSG_WARN(this system does not provide usable locale support)
+       cf_xopen_source="-D_BSD_SOURCE"
+       cf_XOPEN_SOURCE=700
+       ;;
+(openbsd[[4-5]]*)
         # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
         cf_xopen_source="-D_BSD_SOURCE"
         cf_XOPEN_SOURCE=600
         # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
         cf_xopen_source="-D_BSD_SOURCE"
         cf_XOPEN_SOURCE=600
@@ -4240,12 +4561,20 @@ case $host_os in
         ;;
  (*)
         CF_TRY_XOPEN_SOURCE
         ;;
  (*)
         CF_TRY_XOPEN_SOURCE
+       cf_save_xopen_cppflags="$CPPFLAGS"
         CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
         CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
+       # Some of these niche implementations use copy/paste, double-check...
+       if test "$cf_cv_xopen_source" = no ; then
+               CF_VERBOSE(checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE)
+               AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,,[
+                       AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable)
+                       CPPFLAGS="$cf_save_xopen_cppflags"])
+       fi
         ;;
  esac
  
  if test -n "$cf_xopen_source" ; then
         ;;
  esac
  
  if test -n "$cf_xopen_source" ; then
-       CF_ADD_CFLAGS($cf_xopen_source,true)
+       CF_APPEND_CFLAGS($cf_xopen_source,true)
  fi
  
  dnl In anything but the default case, we may have system-specific setting
  fi
  
  dnl In anything but the default case, we may have system-specific setting
@@ -4255,20 +4584,20 @@ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
         AC_MSG_CHECKING(if _XOPEN_SOURCE really is set)
         AC_TRY_COMPILE([#include <stdlib.h>],[
  #ifndef _XOPEN_SOURCE
         AC_MSG_CHECKING(if _XOPEN_SOURCE really is set)
         AC_TRY_COMPILE([#include <stdlib.h>],[
  #ifndef _XOPEN_SOURCE
-make an error
+#error _XOPEN_SOURCE is not defined
  #endif],
         [cf_XOPEN_SOURCE_set=yes],
         [cf_XOPEN_SOURCE_set=no])
         AC_MSG_RESULT($cf_XOPEN_SOURCE_set)
  #endif],
         [cf_XOPEN_SOURCE_set=yes],
         [cf_XOPEN_SOURCE_set=no])
         AC_MSG_RESULT($cf_XOPEN_SOURCE_set)
-       if test $cf_XOPEN_SOURCE_set = yes
+       if test "$cf_XOPEN_SOURCE_set" = yes
         then
                 AC_TRY_COMPILE([#include <stdlib.h>],[
  #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
         then
                 AC_TRY_COMPILE([#include <stdlib.h>],[
  #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
-make an error
+#error (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
  #endif],
                 [cf_XOPEN_SOURCE_set_ok=yes],
                 [cf_XOPEN_SOURCE_set_ok=no])
  #endif],
                 [cf_XOPEN_SOURCE_set_ok=yes],
                 [cf_XOPEN_SOURCE_set_ok=no])
-               if test $cf_XOPEN_SOURCE_set_ok = no
+               if test "$cf_XOPEN_SOURCE_set_ok" = no
                 then
                         AC_MSG_WARN(_XOPEN_SOURCE is lower than requested)
                 fi
                 then
                         AC_MSG_WARN(_XOPEN_SOURCE is lower than requested)
                 fi
@@ -4279,7 +4608,7 @@ fi
  fi # cf_cv_posix_visible
  ])
  dnl ---------------------------------------------------------------------------
  fi # cf_cv_posix_visible
  ])
  dnl ---------------------------------------------------------------------------
-dnl CF_X_ATHENA version: 24 updated: 2020/03/10 18:53:47
+dnl CF_X_ATHENA version: 25 updated: 2023/01/11 04:05:23
  dnl -----------
  dnl Check for Xaw (Athena) libraries
  dnl
  dnl -----------
  dnl Check for Xaw (Athena) libraries
  dnl
@@ -4353,6 +4682,7 @@ if test "$PKG_CONFIG" != none ; then
  
  AC_CACHE_CHECK(for usable $cf_x_athena/Xmu package,cf_cv_xaw_compat,[
  AC_TRY_LINK([
  
  AC_CACHE_CHECK(for usable $cf_x_athena/Xmu package,cf_cv_xaw_compat,[
  AC_TRY_LINK([
+$ac_includes_default
  #include <X11/Xmu/CharSet.h>
  ],[
  int check = XmuCompareISOLatin1("big", "small");
  #include <X11/Xmu/CharSet.h>
  ],[
  int check = XmuCompareISOLatin1("big", "small");
@@ -4392,7 +4722,7 @@ if test -z "$cf_x_athena_lib" ; then
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_X_ATHENA_CPPFLAGS version: 8 updated: 2020/01/16 05:21:56
+dnl CF_X_ATHENA_CPPFLAGS version: 9 updated: 2020/12/31 10:54:15
  dnl --------------------
  dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
  dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
  dnl --------------------
  dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
  dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
@@ -4411,7 +4741,7 @@ do
         if test -z "$cf_x_athena_inc" ; then
                 CF_SAVE_XTRA_FLAGS([CF_X_ATHENA_CPPFLAGS])
                 cf_test=X11/$cf_x_athena_root/SimpleMenu.h
         if test -z "$cf_x_athena_inc" ; then
                 CF_SAVE_XTRA_FLAGS([CF_X_ATHENA_CPPFLAGS])
                 cf_test=X11/$cf_x_athena_root/SimpleMenu.h
-               if test $cf_path != default ; then
+               if test "$cf_path" != default ; then
                         CF_APPEND_TEXT(CPPFLAGS,-I$cf_path/include)
                         AC_MSG_CHECKING(for $cf_test in $cf_path)
                 else
                         CF_APPEND_TEXT(CPPFLAGS,-I$cf_path/include)
                         AC_MSG_CHECKING(for $cf_test in $cf_path)
                 else
@@ -4426,7 +4756,7 @@ do
                 CF_RESTORE_XTRA_FLAGS([CF_X_ATHENA_CPPFLAGS])
                 if test "$cf_result" = yes ; then
                         test "$cf_path"  = default && cf_x_athena_inc=default
                 CF_RESTORE_XTRA_FLAGS([CF_X_ATHENA_CPPFLAGS])
                 if test "$cf_result" = yes ; then
                         test "$cf_path"  = default && cf_x_athena_inc=default
-                       test "$cf_path" != default && cf_x_athena_inc=$cf_path/include
+                       test "$cf_path" != default && cf_x_athena_inc="$cf_path/include"
                         break
                 fi
         fi
                         break
                 fi
         fi
@@ -4439,7 +4769,7 @@ elif test "$cf_x_athena_inc" != default ; then
  fi
  ])
  dnl ---------------------------------------------------------------------------
  fi
  ])
  dnl ---------------------------------------------------------------------------
-dnl CF_X_ATHENA_LIBS version: 13 updated: 2020/01/11 18:16:10
+dnl CF_X_ATHENA_LIBS version: 14 updated: 2023/01/11 04:05:23
  dnl ----------------
  dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
  dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
  dnl ----------------
  dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
  dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
@@ -4472,6 +4802,7 @@ do
                 CF_ADD_LIBS($cf_libs)
                 AC_MSG_CHECKING(for $cf_test in $cf_libs)
                 AC_TRY_LINK([
                 CF_ADD_LIBS($cf_libs)
                 AC_MSG_CHECKING(for $cf_test in $cf_libs)
                 AC_TRY_LINK([
+$ac_includes_default
  #include <X11/Intrinsic.h>
  #include <X11/$cf_x_athena_root/SimpleMenu.h>
  ],[
  #include <X11/Intrinsic.h>
  #include <X11/$cf_x_athena_root/SimpleMenu.h>
  ],[
@@ -4508,7 +4839,7 @@ CF_TRY_PKG_CONFIG(Xext,,[
                 [CF_ADD_LIB(Xext)])])
  ])dnl
  dnl ---------------------------------------------------------------------------
                 [CF_ADD_LIB(Xext)])])
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF_X_TOOLKIT version: 25 updated: 2020/03/10 17:26:15
+dnl CF_X_TOOLKIT version: 27 updated: 2023/01/11 04:05:23
  dnl ------------
  dnl Check for X Toolkit libraries
  AC_DEFUN([CF_X_TOOLKIT],
  dnl ------------
  dnl Check for X Toolkit libraries
  AC_DEFUN([CF_X_TOOLKIT],
@@ -4543,6 +4874,7 @@ CF_TRY_PKG_CONFIG(xt,[
  # we have an "xt" package, but it may omit Xt's dependency on X11
  AC_CACHE_CHECK(for usable X dependency,cf_cv_xt_x11_compat,[
  AC_TRY_LINK([
  # we have an "xt" package, but it may omit Xt's dependency on X11
  AC_CACHE_CHECK(for usable X dependency,cf_cv_xt_x11_compat,[
  AC_TRY_LINK([
+$ac_includes_default
  #include <X11/Xlib.h>
  ],[
         int rc1 = XDrawLine((Display*) 0, (Drawable) 0, (GC) 0, 0, 0, 0, 0);
  #include <X11/Xlib.h>
  ],[
         int rc1 = XDrawLine((Display*) 0, (Drawable) 0, (GC) 0, 0, 0, 0, 0);
@@ -4561,6 +4893,7 @@ AC_TRY_LINK([
  
  AC_CACHE_CHECK(for usable X Toolkit package,cf_cv_xt_ice_compat,[
  AC_TRY_LINK([
  
  AC_CACHE_CHECK(for usable X Toolkit package,cf_cv_xt_ice_compat,[
  AC_TRY_LINK([
+$ac_includes_default
  #include <X11/Shell.h>
  ],[int num = IceConnectionNumber(0); (void) num
  ],[cf_cv_xt_ice_compat=yes],[cf_cv_xt_ice_compat=no])])
  #include <X11/Shell.h>
  ],[int num = IceConnectionNumber(0); (void) num
  ],[cf_cv_xt_ice_compat=yes],[cf_cv_xt_ice_compat=no])])
@@ -4601,7 +4934,7 @@ AC_TRY_LINK([
                  LIBS="-lXt $LIBS"])])
  ])
  
                  LIBS="-lXt $LIBS"])])
  ])
  
-if test $cf_have_X_LIBS = no ; then
+if test "$cf_have_X_LIBS" = no ; then
         AC_MSG_WARN(
  [Unable to successfully link X Toolkit library (-lXt) with
  test program.  You will have to check and add the proper libraries by hand
         AC_MSG_WARN(
  [Unable to successfully link X Toolkit library (-lXt) with
  test program.  You will have to check and add the proper libraries by hand
@@ -4609,7 +4942,7 @@ to makefile.])
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
-dnl CF__CURSES_DATA version: 2 updated: 2020/02/08 21:00:26
+dnl CF__CURSES_DATA version: 3 updated: 2021/01/04 19:45:09
  dnl ---------------
  dnl Attempt to make a copy of a curses data item.  This is needed in the
  dnl check-data configure tests when using ncurses, because the symbol may be
  dnl ---------------
  dnl Attempt to make a copy of a curses data item.  This is needed in the
  dnl check-data configure tests when using ncurses, because the symbol may be
@@ -4624,7 +4957,7 @@ define([CF__CURSES_DATA],[
  #else
         const void *$1 = &($2);
  #endif
  #else
         const void *$1 = &($2);
  #endif
-       fprintf(stderr, "testing linkage of $2:%p\n", (const void *)$1);
+       fprintf(stderr, "testing linkage of $2:%p\\n", (const void *)$1);
  ])dnl
  dnl ---------------------------------------------------------------------------
  dnl CF__CURSES_HEAD version: 2 updated: 2010/10/23 15:54:49
  ])dnl
  dnl ---------------------------------------------------------------------------
  dnl CF__CURSES_HEAD version: 2 updated: 2010/10/23 15:54:49
@@ -4646,3 +4979,21 @@ char * XCursesProgramName = "test";
  #endif
  #endif
  ])
  #endif
  #endif
  ])
+dnl ---------------------------------------------------------------------------
+dnl CF__XOPEN_SOURCE_BODY version: 2 updated: 2023/02/18 17:41:25
+dnl ---------------------
+dnl body of test when test-compiling for _XOPEN_SOURCE check
+define([CF__XOPEN_SOURCE_BODY],
+[
+#ifndef _XOPEN_SOURCE
+#error _XOPEN_SOURCE is not defined
+#endif
+])
+dnl ---------------------------------------------------------------------------
+dnl CF__XOPEN_SOURCE_HEAD version: 2 updated: 2023/02/18 17:41:25
+dnl ---------------------
+dnl headers to include when test-compiling for _XOPEN_SOURCE check
+define([CF__XOPEN_SOURCE_HEAD],
+[
+$ac_includes_default
+])