From 64b147106d904bcbf8bb492c448f4db2d850765b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 11 Dec 2020 17:35:59 -0800 Subject: [PATCH] vararrays: just use 2.70 * m4/vararrays.m4 (AC_C_VARARRAYS): Do not override Autoconf 2.70 and later, since Autoconf 2.70 matches Gnulib now. --- ChangeLog | 4 ++++ m4/vararrays.m4 | 14 +++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54e21a4a0b..78aa40ab3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2020-12-11 Paul Eggert + vararrays: just use 2.70 + * m4/vararrays.m4 (AC_C_VARARRAYS): Do not override Autoconf 2.70 + and later, since Autoconf 2.70 matches Gnulib now. + sys_types: just use 2.70 * m4/sys_types_h.m4 (AC_HEADER_MAJOR): Reindent to match Autoconf sources. diff --git a/m4/vararrays.m4 b/m4/vararrays.m4 index 49ded2efe0..9524a6ddd3 100644 --- a/m4/vararrays.m4 +++ b/m4/vararrays.m4 @@ -1,6 +1,6 @@ # Check for variable-length arrays. -# serial 5 +# serial 6 # From Paul Eggert @@ -9,9 +9,11 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# This is a copy of AC_C_VARARRAYS from a recent development version -# of Autoconf. It replaces Autoconf's version, or for pre-2.61 autoconf -# it defines the macro that Autoconf lacks. +m4_version_prereq([2.70], [], [ + +# AC_C_VARARRAYS +# -------------- +# Check whether the C compiler supports variable-length arrays. AC_DEFUN([AC_C_VARARRAYS], [ AC_CACHE_CHECK([for variable-length arrays], @@ -27,7 +29,7 @@ AC_DEFUN([AC_C_VARARRAYS], [[/* Test for VLA support. This test is partly inspired from examples in the C standard. Use at least two VLA functions to detect the GCC 3.4.3 bug described in: - https://lists.gnu.org/r/bug-gnulib/2014-08/msg00014.html + https://lists.gnu.org/archive/html/bug-gnulib/2014-08/msg00014.html */ #ifdef __STDC_NO_VLA__ syntax error; @@ -66,3 +68,5 @@ AC_DEFUN([AC_C_VARARRAYS], if the compiler does not already define this.]) fi ]) + +]) -- 2.39.5