[PATCH 7/8] sys_types: just use 2.70

[Paul Eggert]

* m4/sys_types_h.m4 (AC_HEADER_MAJOR):
Reindent to match Autoconf sources.
Use Autoconf 2.70 as a prerequisite, not 2.69c.
---
 ChangeLog         |  5 +++++
 m4/sys_types_h.m4 | 22 ++++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b8d0daf09..54e21a4a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2020-12-11  Paul Eggert  <eggert@cs.ucla.edu>
 
+       sys_types: just use 2.70
+       * m4/sys_types_h.m4 (AC_HEADER_MAJOR):
+       Reindent to match Autoconf sources.
+       Use Autoconf 2.70 as a prerequisite, not 2.69c.
+
        stdint: port to Autoconf 2.70
        * m4/stdint.m4 (gl_STDINT_H): Check for inttypes.h and sys/types.h
        instead of assuming that AC_INCLUDES_DEFAULT does it.
diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4
index 419b85703..c3a691bec 100644
--- a/m4/sys_types_h.m4
+++ b/m4/sys_types_h.m4
@@ -1,4 +1,4 @@
-# sys_types_h.m4 serial 10
+# sys_types_h.m4 serial 11
 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,
@@ -36,25 +36,23 @@ AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS],
 
 # This works around a buggy version in autoconf <= 2.69.
 # See <https://lists.gnu.org/r/autoconf/2016-08/msg00014.html>
+# The 2.70 version isn't quoted properly, so override it too.
 
-m4_version_prereq([2.69c], [], [
-
-# This is taken from the following Autoconf patch:
-# 
https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=e17a30e987d7ee695fb4294a82d987ec3dc9b974
+m4_version_prereq([2.70.1], [], [
 
 m4_undefine([AC_HEADER_MAJOR])
 AC_DEFUN([AC_HEADER_MAJOR],
 [AC_CHECK_HEADERS_ONCE([sys/types.h])
 AC_CHECK_HEADER([sys/mkdev.h],
-  [AC_DEFINE([MAJOR_IN_MKDEV], [1],
-    [Define to 1 if `major', `minor', and `makedev' are declared in
-     <mkdev.h>.])])
+                [AC_DEFINE([MAJOR_IN_MKDEV], [1],
+                           [Define to 1 if `major', `minor', and `makedev' are
+                            declared in <mkdev.h>.])])
 if test $ac_cv_header_sys_mkdev_h = no; then
   AC_CHECK_HEADER([sys/sysmacros.h],
-    [AC_DEFINE([MAJOR_IN_SYSMACROS], [1],
-      [Define to 1 if `major', `minor', and `makedev' are declared in
-       <sysmacros.h>.])])
+                  [AC_DEFINE([MAJOR_IN_SYSMACROS], [1],
+                             [Define to 1 if `major', `minor', and `makedev'
+                              are declared in <sysmacros.h>.])])
 fi
-])
+])# AC_HEADER_MAJOR
 
 ])
-- 
2.28.0