9 files changed, 1097 insertions, 587 deletions

diff --git a/am/proctitle.m4 b/am/proctitle.m4
index 3035efd..73afd87 100644
--- a/am/proctitle.m4
+++ b/am/proctitle.m4
@@ -23,12 +23,12 @@ AC_DEFUN([MF_PROCTITLE],[
 #define MF_PROCTITLE_PSTAT        3 
 #define MF_PROCTITLE_PSSTRINGS    4
 ])
-  AC_SUBST(MF_PROCTITLE_LIBS)
+  AC_SUBST([MF_PROCTITLE_LIBS])
 
-  AC_TRY_LINK([extern char *__progname, *__progname_full;],
-              [__progname = "foo"; __progname_full = "foo bar";],
-              [AC_DEFINE(HAVE___PROGNAME, 1,
-                         [Define to 1 if libc has __progname])])
+  AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM([[extern char *__progname, *__progname_full;]],
+      [[__progname = "foo"; __progname_full = "foo bar";]])],
+      [AC_DEFINE(HAVE___PROGNAME, 1, [Define to 1 if libc has __progname])])
 
   mf_proctitle_type=no
   AC_CHECK_FUNC(setproctitle,
@@ -44,9 +44,10 @@ AC_DEFUN([MF_PROCTITLE],[
                           [mf_proctitle_type=MF_PROCTITLE_PSTAT],
                           [mf_proctitle_type=MF_PROCTITLE_REWRITE_ARGV])])
     if test "$mf_proctitle_type" = no; then
-      AC_TRY_COMPILE([#include <machine/vmparam.h>
-                      #include <sys/exec.h>],
-                     [
+      AC_COMPILE_IFELSE(
+            [AC_LANG_PROGRAM([[#include <machine/vmparam.h>
+                               #include <sys/exec.h>]],
+                     [[
 #include <sys/types.h>
 #include <sys/proc.h>
 #include <vm/pmap.h>
@@ -54,11 +55,12 @@ AC_DEFUN([MF_PROCTITLE],[
 #include <machine/vmparam.h>
 #include <sys/exec.h>
 
+int
 main()
 {
   int i = PS_STRINGS;
 }
-],
+]])],
                      [mf_proctitle_type=MF_PROCTITLE_PSSTRINGS])
                      
       if test "$mf_proctitle_type" = no; then
diff --git a/bootstrap b/bootstrap
index e72894c..979b3af 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,34 +1,67 @@
 #! /bin/sh
-# Print a version string.
-scriptversion=2014-12-08.12; # UTC
+# DO NOT EDIT! GENERATED AUTOMATICALLY!
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+scriptversion=2023-08-29.21; # UTC
 
+# Copyright (C) 2003-2023 Free Software Foundation, Inc.
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# Originally written by Paul Eggert.  The canonical version of this
+# script is maintained as top/bootstrap in gnulib. However, to be
+# useful to your package, you should place a copy of it under version
+# control in the top-level directory of your package.  The intent is
+# that all customization can be done with a bootstrap.conf file also
+# maintained in your version control; gnulib comes with a template
+# build-aux/bootstrap.conf to get you started.
+
+# Please report bugs or propose patches to bug-gnulib@gnu.org.
 
+me="$0"
+medir=`dirname "$me"`
+
+# Read the function library and the configuration.
+
+# A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
+
+scriptlibversion=2023-08-28.18; # UTC
+
+# Copyright (C) 2003-2023 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Originally written by Paul Eggert.  The canonical version of this
-# script is maintained as build-aux/bootstrap in gnulib, however, to
-# be useful to your project, you should place a copy of it under
-# version control in the top-level directory of your project.  The
+# script is maintained as top/bootstrap-funclib.sh in gnulib.  However,
+# to be useful to your package, you should place a copy of it under
+# version control in the top-level directory of your package.  The
 # intent is that all customization can be done with a bootstrap.conf
 # file also maintained in your version control; gnulib comes with a
 # template build-aux/bootstrap.conf to get you started.
 
-# Please report bugs or propose patches to bug-gnulib@gnu.org.
-
 nl='
 '
 
@@ -36,49 +69,17 @@ nl='
 LC_ALL=C
 export LC_ALL
 
-# Ensure that CDPATH is not set.  Otherwise, the output from cd
-# would cause trouble in at least one use below.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-local_gl_dir=gl
-
-# Honour $PERL, but work even if there is none
+# Honor $PERL, but work even if there is none.
 PERL="${PERL-perl}"
 
-me=$0
+default_gnulib_url=https://git.savannah.gnu.org/git/gnulib.git
 
-usage() {
-  cat <<EOF
-Usage: $me [OPTION]...
-Bootstrap this package from the checked-out sources.
-
-Options:
- --gnulib-srcdir=DIRNAME  specify the local directory where gnulib
-                          sources reside.  Use this if you already
-                          have gnulib sources on your machine, and
-                          do not want to waste your bandwidth downloading
-                          them again.  Defaults to \$GNULIB_SRCDIR
- --bootstrap-sync         if this bootstrap script is not identical to
-                          the version in the local gnulib sources,
-                          update this script, and then restart it with
-                          /bin/sh or the shell \$CONFIG_SHELL
- --no-bootstrap-sync      do not check whether bootstrap is out of sync
- --copy                   copy files instead of creating symbolic links
- --force                  attempt to bootstrap even if the sources seem
-                          not to have been checked out
- --no-git                 do not use git to update gnulib.  Requires that
-                          --gnulib-srcdir point to a correct gnulib snapshot
- --skip-po                do not download po files
-
-If the file $me.conf exists in the same directory as this script, its
-contents are read as shell variables to configure the bootstrap.
-
-For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
-are honored.
-
-Running without arguments will suffice in most cases.
-EOF
-}
+# Copyright year, for the --version output.
+copyright_year=`echo "$scriptlibversion" | sed -e 's/[^0-9].*//'`
+copyright="Copyright (C) ${copyright_year} Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law."
 
 # warnf_ FORMAT-STRING ARG1...
 warnf_ ()
@@ -107,9 +108,13 @@ warn_ ()
 # die WORD1...
 die() { warn_ "$@"; exit 1; }
 
-# Configuration.
+# ------------------------------ Configuration. ------------------------------
+
+# Directory that contains package-specific gnulib modules and/or overrides.
+local_gl_dir=gl
 
 # Name of the Makefile.am
+# XXX Not used.
 gnulib_mk=gnulib.mk
 
 # List of gnulib modules needed.
@@ -118,8 +123,19 @@ gnulib_modules=
 # Any gnulib files needed that are not in modules.
 gnulib_files=
 
-: ${AUTOPOINT=autopoint}
-: ${AUTORECONF=autoreconf}
+# A function to be called for each unrecognized option.  Returns 0 if
+# the option in $1 has been processed by the function.  Returns 1 if
+# the option has not been processed by the function.  Override it via
+# your own definition in bootstrap.conf
+bootstrap_option_hook() { return 1; }
+
+# A function to be called in order to print the --help information
+# corresponding to user-defined command-line options.
+bootstrap_print_option_usage_hook() { :; }
+<