[3.12] GH-89886: Bump to GNU Autoconf v2.71 (#104925) (#105207)

Co-authored-by: Christian Heimes <christian@python.org>
python · Jun 1, 2023 · 83c7386 · 83c7386
1 parent 25543ae
commit 83c7386
Show file tree

Hide file tree

Showing 8 changed files with 10,919 additions and 7,754 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -143,10 +143,10 @@ jobs:
         run: echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
       - name: Configure ccache action
         uses: hendrikmuhs/ccache-action@v1.2
-      - name: Check Autoconf version 2.69 and aclocal 1.16.3
+      - name: Check Autoconf and aclocal versions
         run: |
-          grep "Generated by GNU Autoconf 2.69" configure
-          grep "aclocal 1.16.3" aclocal.m4
+          grep "Generated by GNU Autoconf 2.71" configure
+          grep "aclocal 1.16.4" aclocal.m4
           grep -q "runstatedir" configure
           grep -q "PKG_PROG_PKG_CONFIG" aclocal.m4
       - name: Configure CPython

diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
@@ -1506,6 +1506,10 @@ Build Changes
 
 * ``PYTHON_FOR_REGEN`` now require Python 3.10 or newer.
 
+* Autoconf 2.71 and aclocal 1.16.4 is now required to regenerate
+  :file:`!configure`.
+  (Contributed by Christian Heimes in :gh:`89886`.)
+
 
 C API Changes
 =============

diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -2584,7 +2584,7 @@ regen-configure:
 	@if command -v podman >/dev/null; then RUNTIME="podman"; else RUNTIME="docker"; fi; \
 	if ! command -v $$RUNTIME; then echo "$@ needs either Podman or Docker container runtime." >&2; exit 1; fi; \
 	if command -v selinuxenabled >/dev/null && selinuxenabled; then OPT=":Z"; fi; \
-	CMD="$$RUNTIME run --rm --pull=always -v $(abs_srcdir):/src$$OPT quay.io/tiran/cpython_autoconf:269"; \
+	CMD="$$RUNTIME run --rm --pull=always -v $(abs_srcdir):/src$$OPT quay.io/tiran/cpython_autoconf:271"; \
 	echo $$CMD; \
 	$$CMD || exit $?
 

diff --git a/Misc/NEWS.d/next/Build/2023-05-26-15-44-20.gh-issue-89886._iSW-p.rst b/Misc/NEWS.d/next/Build/2023-05-26-15-44-20.gh-issue-89886._iSW-p.rst
@@ -0,0 +1,2 @@
+Autoconf 2.71 and aclocal 1.16.4 is now required to regenerate
+:file:`!configure`.
diff --git a/aclocal.m4 b/aclocal.m4
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Autoconf 2.71 and aclocal 1.16.4 is now required to regenerate
		:file:`!configure`.