From 9df3c066aabbc7131b95ca14827f83fbe593758d Mon Sep 17 00:00:00 2001
From: John Zaitseff <J.Zaitseff@zap.org.au>
Date: Tue, 21 May 2024 04:36:37 +1000
Subject: [PATCH] Update to the latest version of Gnulib

Specify ACLOCAL_AMFLAGS as otherwise the current Python version of
gnulib-tool fails with "IndexError: list index out of range".
---
 Makefile.am    | 3 +++
 NEWS           | 4 ++++
 configure.ac   | 2 +-
 lib/.gitignore | 1 +
 m4/.gitignore  | 1 +
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 03ab756a..bcafc638 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,9 @@
 # along with this program.  If not, see https://www.gnu.org/licenses/.
 
 
+# Specify m4 include directory
+ACLOCAL_AMFLAGS = -I m4
+
 # Subdirectories to recurse into
 SUBDIRS = lib src po data doc m4
 
diff --git a/NEWS b/NEWS
index 661bab97..ac6105ac 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,10 @@ Version 7.21 (not yet released)
 Minor bug fix for the manual page: removed the invocation to the
 undefined "mR" font.
 
+Updated to the latest snapshot of the Gnulib GNU Portability Library,
+including changes to make Star Traders work with Gnulib’s new
+Python-based ``gnulib-tool``.
+
 
 Version 7.20 (31st January, 2024)
 ---------------------------------
diff --git a/configure.ac b/configure.ac
index 1023a6bd..8d0d7577 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_INIT([Star Traders], [7.21], [J.Zaitseff@zap.org.au], [trader],
 AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author])
 
 AC_PREREQ([2.71])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 AC_CONFIG_SRCDIR([src/trader.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
diff --git a/lib/.gitignore b/lib/.gitignore
index b6b3ab96..6c6a3cf0 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -60,6 +60,7 @@
 /memchr.valgrind
 /monetary.in.h
 /setlocale-lock.c
+/setlocale_null-unlocked.c
 /setlocale_null.c
 /setlocale_null.h
 /stdbool.in.h
diff --git a/m4/.gitignore b/m4/.gitignore
index 2b450f78..9edab250 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -42,6 +42,7 @@
 /multiarch.m4
 /musl.m4
 /nocrash.m4
+/off64_t.m4
 /off_t.m4
 /pid_t.m4
 /setlocale_null.m4