[SV 65537] Update to newer gnulib

* bootstrap.conf: Switch to gnulib stable-202401 branch.
* maintMakefile: Support an EXTRA_CFLAGS variable in maintainer mode.
* README.git: Describe how to use it.

diff --git a/README.git b/README.git
index 045f6414064998d1ec40af0bd406d6cdcf879d83..2d794594c1dfbe99a168070ae33ebc7557b39406 100644 (file)
--- a/README.git
+++ b/README.git
@@ -155,7 +155,8 @@ NOTE! This method builds GNU Make in "maintainer mode".  Make programs built
       If you want to build from Git with "maintainer mode" disabled, add
       "MAKE_MAINTAINER_MODE=" to the make command line.  If you want to turn
       off the extra warning flags, add "MAKE_CFLAGS=" to the make command
-      line.
+      line.  If you want to keep the warnings but not fail, add
+      "EXTRA_CFLAGS=-Wno-error" to the make command line.
 
       For example:
         $ ./configure

diff --git a/bootstrap.conf b/bootstrap.conf
index 98a709a59514ee3212b47437bf686cb1aa46cfb3..871bdb09ea1be142a67a4a7ec5344a76b26e377c 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -19,7 +19,7 @@
 checkout_only_file=README.git
 
 # Choose a specific version of gnulib, when checking out
-GNULIB_REVISION=stable-202307
+GNULIB_REVISION=stable-202401
 
 # Always copy files rather than symlink
 copy=true

diff --git a/maintMakefile b/maintMakefile
index 22792f498bee4dbec993744410eea713bdabfa3c..dd4b724def36be71e4496236d0de22c3a3d0db3f 100644 (file)
--- a/maintMakefile
+++ b/maintMakefile
@@ -34,7 +34,10 @@ MAKE_CFLAGS := -C -Wall -Wextra -Werror -Wwrite-strings -Wshadow \
        -Wtype-limits -Wunused-but-set-parameter -Wlogical-op -Wpointer-arith \
        -Wignored-qualifiers -Wformat-signedness -Wduplicated-cond
 
-AM_CFLAGS += $(MAKE_CFLAGS)
+# Allow extra options without overriding MAKE_CFLAGS
+EXTRA_CFLAGS :=
+
+AM_CFLAGS += $(MAKE_CFLAGS) $(EXTRA_CFLAGS)
 
 # Unfortunately the Guile headers are sometimes broken.  Convince GCC
 # to treat them as system headers so warnings are ignored.