From a627ff514eb6766179a7e46cf261cca300f498ed Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 28 Sep 2020 00:15:38 +0200 Subject: [PATCH] Enable testing of prereleases of Autoconf 2.70. Suggested by Paul Eggert in . * m4/alloca.m4 (_AC_LIBOBJ_ALLOCA): Test for Autoconf >= 2.69c, not >= 2.70. * m4/largefile.m4 (AC_SYS_LARGEFILE): Likewise. * m4/pid_t.m4 (AC_TYPE_PID_T): Likewise. * m4/sys_types_h.m4 (AC_HEADER_MAJOR): Likewise. --- ChangeLog | 11 +++++++++++ m4/alloca.m4 | 6 +++--- m4/largefile.m4 | 4 ++-- m4/pid_t.m4 | 4 ++-- m4/sys_types_h.m4 | 4 ++-- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf7859dd95..df8247620e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2020-09-27 Bruno Haible + + Enable testing of prereleases of Autoconf 2.70. + Suggested by Paul Eggert in + . + * m4/alloca.m4 (_AC_LIBOBJ_ALLOCA): Test for Autoconf >= 2.69c, not + >= 2.70. + * m4/largefile.m4 (AC_SYS_LARGEFILE): Likewise. + * m4/pid_t.m4 (AC_TYPE_PID_T): Likewise. + * m4/sys_types_h.m4 (AC_HEADER_MAJOR): Likewise. + 2020-09-27 Bruno Haible Avoid "warning: The macro `AC_PROG_CC_STDC' is obsolete". diff --git a/m4/alloca.m4 b/m4/alloca.m4 index d841489630..619959b4de 100644 --- a/m4/alloca.m4 +++ b/m4/alloca.m4 @@ -1,4 +1,4 @@ -# alloca.m4 serial 18 +# alloca.m4 serial 19 dnl Copyright (C) 2002-2004, 2006-2007, 2009-2020 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -50,10 +50,10 @@ AC_DEFUN([gl_FUNC_ALLOCA], # STACK_DIRECTION is already handled by AC_FUNC_ALLOCA. AC_DEFUN([gl_PREREQ_ALLOCA], [:]) -m4_version_prereq([2.70], [], [ +m4_version_prereq([2.69c], [], [ # This works around a bug in autoconf <= 2.68 and has simplifications -# from 2.70. See: +# from 2.69c. See: # https://lists.gnu.org/r/bug-gnulib/2011-06/msg00277.html # https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=6cd9f12520b0d6f76d3230d7565feba1ecf29497 # https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=15edf7fd8094fd14a89d9891dd72a9624762597a diff --git a/m4/largefile.m4 b/m4/largefile.m4 index f4c5d3a5ce..2562d064b3 100644 --- a/m4/largefile.m4 +++ b/m4/largefile.m4 @@ -25,7 +25,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], # The following implementation works around a problem in autoconf <= 2.69; # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, # or configures them incorrectly in some cases. -m4_version_prereq([2.70], [] ,[ +m4_version_prereq([2.69c], [] ,[ # _AC_SYS_LARGEFILE_TEST_INCLUDES # ------------------------------- @@ -115,7 +115,7 @@ if test "$enable_largefile" != no; then fi fi ])# AC_SYS_LARGEFILE -])# m4_version_prereq 2.70 +])# m4_version_prereq 2.69c # Enable large files on systems where this is implemented by Gnulib, not by the # system headers. diff --git a/m4/pid_t.m4 b/m4/pid_t.m4 index 4fb9c7aef9..3eb7916627 100644 --- a/m4/pid_t.m4 +++ b/m4/pid_t.m4 @@ -1,11 +1,11 @@ -# pid_t.m4 serial 2 +# pid_t.m4 serial 3 dnl Copyright (C) 2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. # The following implementation works around a problem in autoconf <= 2.69. -m4_version_prereq([2.70], [] ,[ +m4_version_prereq([2.69c], [] ,[ dnl Define pid_t if the headers don't define it. AC_DEFUN([AC_TYPE_PID_T], diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 index be918dc0d8..419b85703d 100644 --- a/m4/sys_types_h.m4 +++ b/m4/sys_types_h.m4 @@ -1,4 +1,4 @@ -# sys_types_h.m4 serial 9 +# sys_types_h.m4 serial 10 dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -37,7 +37,7 @@ AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], # This works around a buggy version in autoconf <= 2.69. # See -m4_version_prereq([2.70], [], [ +m4_version_prereq([2.69c], [], [ # This is taken from the following Autoconf patch: # https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=e17a30e987d7ee695fb4294a82d987ec3dc9b974 -- 2.39.5