From: Bruno Haible <bruno@clisp.org>
Date: Thu, 4 Apr 2024 09:56:10 +0000 (+0200)
Subject: Make the file header of *.m4 files consistent:
X-Git-Tag: v1.0~172
X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=ea81f2b64e07b81e4acb9ce161402469430d0537;p=gnulib.git

Make the file header of *.m4 files consistent:

1. The file name.
2. The serial number.
3. The copyright and license header.

* m4/*.m4: Adjust file headers.
---

diff --git a/ChangeLog b/ChangeLog
index f8753e2be4..13bb61bc14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2024-04-04  Bruno Haible  <bruno@clisp.org>
 
+	Make the file header of *.m4 files consistent:
+	1. The file name.
+	2. The serial number.
+	3. The copyright and license header.
+	* m4/*.m4: Adjust file headers.
+
 	Make the serial numbers in *.m4 files effective.
 	Reported by Sam James in
 	<https://lists.gnu.org/archive/html/bug-gnulib/2024-04/msg00051.html>.
diff --git a/m4/acl.m4 b/m4/acl.m4
index 2050d108b0..c7b6ec2b14 100644
--- a/m4/acl.m4
+++ b/m4/acl.m4
@@ -1,10 +1,11 @@
-# acl.m4 - check for access control list (ACL) primitives
+# acl.m4
 # serial 30
+dnl Copyright (C) 2002, 2004-2024 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.
 
-# Copyright (C) 2002, 2004-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Check for access control list (ACL) primitives
 
 # Written by Paul Eggert and Jim Meyering.
 
diff --git a/m4/argz.m4 b/m4/argz.m4
index 5c1f3d4ed7..51a358d55a 100644
--- a/m4/argz.m4
+++ b/m4/argz.m4
@@ -1,13 +1,13 @@
+# argz.m4
+# serial 15
+dnl Copyright (C) 2004-2024 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.
+
 # Portability macros for glibc argz.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004-2024 Free Software Foundation, Inc.
-#   Written by Gary V. Vaughan <gary@gnu.org>
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
 
-# serial 15 argz.m4
+# Written by Gary V. Vaughan <gary@gnu.org>
 
 AC_DEFUN([gl_FUNC_ARGZ],
 [gl_PREREQ_ARGZ
diff --git a/m4/assert.m4 b/m4/assert.m4
index 6219c058c1..6d2578743e 100644
--- a/m4/assert.m4
+++ b/m4/assert.m4
@@ -1,9 +1,9 @@
-#serial 8
-
-# Copyright (C) 1998-1999, 2001, 2004, 2008-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# assert.m4
+# serial 8
+dnl Copyright (C) 1998-1999, 2001, 2004, 2008-2024 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.
 
 dnl based on code from Eleftherios Gkioulekas
 dnl Autoconf 2.60 provides AC_HEADER_ASSERT for the same purpose, but
diff --git a/m4/bison.m4 b/m4/bison.m4
index f98416e54e..66743f1e34 100644
--- a/m4/bison.m4
+++ b/m4/bison.m4
@@ -1,9 +1,9 @@
+# bison.m4
 # serial 10
-
-# Copyright (C) 2002-2006, 2008-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2002-2006, 2008-2024 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.
 
 # There are two types of parser skeletons:
 #
diff --git a/m4/c-stack.m4 b/m4/c-stack.m4
index 99c04cdfdc..64080f3173 100644
--- a/m4/c-stack.m4
+++ b/m4/c-stack.m4
@@ -1,14 +1,14 @@
-# Check prerequisites for compiling lib/c-stack.c.
+# c-stack.m4
+# serial 25
+dnl Copyright (C) 2002-2004, 2008-2024 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.
 
-# Copyright (C) 2002-2004, 2008-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Check prerequisites for compiling lib/c-stack.c.
 
 # Written by Paul Eggert.
 
-# serial 25
-
 AC_DEFUN([gl_C_STACK],
 [
   dnl 'c-stack' needs -lsigsegv if and only if the 'sigsegv' module needs it.
diff --git a/m4/c-strtod.m4 b/m4/c-strtod.m4
index e9822fc1a4..5f0a0e07be 100644
--- a/m4/c-strtod.m4
+++ b/m4/c-strtod.m4
@@ -1,10 +1,9 @@
 # c-strtod.m4
 # serial 21
-
-# Copyright (C) 2004-2006, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2004-2006, 2009-2024 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.
 
 # Written by Paul Eggert.
 
diff --git a/m4/calloc.m4 b/m4/calloc.m4
index c37506ef40..550cf5cc90 100644
--- a/m4/calloc.m4
+++ b/m4/calloc.m4
@@ -1,10 +1,9 @@
 # calloc.m4
 # serial 31
-
-# Copyright (C) 2004-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2004-2024 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.
 
 # Written by Jim Meyering.
 
diff --git a/m4/chdir-long.m4 b/m4/chdir-long.m4
index 62c7a79c61..292c2c18d4 100644
--- a/m4/chdir-long.m4
+++ b/m4/chdir-long.m4
@@ -1,4 +1,9 @@
-#serial 17
+# chdir-long.m4
+# serial 17
+dnl Copyright (C) 2004-2007, 2009-2024 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.
 
 # Use Gnulib's robust chdir function.
 # It can handle arbitrarily long directory names, which means
@@ -6,11 +11,6 @@
 # never fails with ENAMETOOLONG.
 # Arrange to compile chdir-long.c only on systems that define PATH_MAX.
 
-dnl Copyright (C) 2004-2007, 2009-2024 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.
-
 # Written by Jim Meyering.
 
 AC_DEFUN([gl_FUNC_CHDIR_LONG],
diff --git a/m4/chown.m4 b/m4/chown.m4
index 0f5f760ad1..293d3f93fc 100644
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -1,13 +1,12 @@
+# chown.m4
 # serial 36
-# Determine whether we need the chown wrapper.
-
-dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2024 Free Software
-dnl Foundation, Inc.
-
+dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2024 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.
 
+# Determine whether we need the chown wrapper.
+
 # chown should accept arguments of -1 for uid and gid, and it should
 # dereference symlinks.  If it doesn't, arrange to use the replacement
 # function.
diff --git a/m4/cycle-check.m4 b/m4/cycle-check.m4
index 9d35a60a1a..359d616b31 100644
--- a/m4/cycle-check.m4
+++ b/m4/cycle-check.m4
@@ -1,4 +1,5 @@
-#serial 7
+# cycle-check.m4
+# serial 7
 dnl Copyright (C) 2005-2007, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/d-ino.m4 b/m4/d-ino.m4
index b127ab2405..4039937239 100644
--- a/m4/d-ino.m4
+++ b/m4/d-ino.m4
@@ -1,16 +1,13 @@
+# d-ino.m4
 # serial 22
+dnl Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009-2024 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.
 
 dnl From Jim Meyering.
 dnl
 dnl Check whether struct dirent has a member named d_ino.
-dnl
-
-# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009-2024 Free Software
-# Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO],
   [AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
diff --git a/m4/d-type.m4 b/m4/d-type.m4
index b06bca5a7d..0ef89b86b1 100644
--- a/m4/d-type.m4
+++ b/m4/d-type.m4
@@ -1,15 +1,13 @@
+# d-type.m4
 # serial 12
+dnl Copyright (C) 1997, 1999-2004, 2006, 2009-2024 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.
 
 dnl From Jim Meyering.
 dnl
 dnl Check whether struct dirent has a member named d_type.
-dnl
-
-# Copyright (C) 1997, 1999-2004, 2006, 2009-2024 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE],
   [AC_CACHE_CHECK([for d_type member in directory struct],
diff --git a/m4/dirent-safer.m4 b/m4/dirent-safer.m4
index d584ea7be6..43de560ced 100644
--- a/m4/dirent-safer.m4
+++ b/m4/dirent-safer.m4
@@ -1,4 +1,5 @@
-#serial 2
+# dirent-safer.m4
+# serial 2
 dnl Copyright (C) 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/dirfd.m4 b/m4/dirfd.m4
index e58582e614..605cb706c0 100644
--- a/m4/dirfd.m4
+++ b/m4/dirfd.m4
@@ -1,12 +1,12 @@
+# dirfd.m4
 # serial 30   -*- Autoconf -*-
+dnl Copyright (C) 2001-2006, 2008-2024 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.
 
 dnl Find out how to get the file descriptor associated with an open DIR*.
 
-# Copyright (C) 2001-2006, 2008-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 dnl From Jim Meyering
 
 AC_DEFUN([gl_FUNC_DIRFD],
diff --git a/m4/dup2.m4 b/m4/dup2.m4
index f6759b647a..786121fd8f 100644
--- a/m4/dup2.m4
+++ b/m4/dup2.m4
@@ -1,4 +1,5 @@
-#serial 28
+# dup2.m4
+# serial 28
 dnl Copyright (C) 2002, 2005, 2007, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/error.m4 b/m4/error.m4
index 5688afcf49..273b636b5d 100644
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,10 +1,9 @@
-#serial 16
-
-# Copyright (C) 1996-1998, 2001-2004, 2009-2024 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# error.m4
+# serial 16
+dnl Copyright (C) 1996-1998, 2001-2004, 2009-2024 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.
 
 AC_DEFUN([gl_ERROR],
 [
diff --git a/m4/extensions.m4 b/m4/extensions.m4
index 6fc2e300e0..887c651564 100644
--- a/m4/extensions.m4
+++ b/m4/extensions.m4
@@ -1,10 +1,11 @@
+# extensions.m4
 # serial 23  -*- Autoconf -*-
-# Enable extensions on systems that normally disable them.
+dnl Copyright (C) 2003, 2006-2024 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.
 
-# Copyright (C) 2003, 2006-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Enable extensions on systems that normally disable them.
 
 dnl Define to empty for the benefit of Autoconf 2.69 and earlier, so that
 dnl AC_USE_SYSTEM_EXTENSIONS (below) can be used unchanged from Autoconf 2.70+.
diff --git a/m4/faccessat.m4 b/m4/faccessat.m4
index b8c058cef2..c5f40e5290 100644
--- a/m4/faccessat.m4
+++ b/m4/faccessat.m4
@@ -1,11 +1,12 @@
+# faccessat.m4
 # serial 12
-# See if we need to provide faccessat replacement.
-
 dnl Copyright (C) 2009-2024 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.
 
+# See if we need to provide faccessat replacement.
+
 # Written by Eric Blake.
 
 AC_DEFUN([gl_FUNC_FACCESSAT],
diff --git a/m4/fcntl-safer.m4 b/m4/fcntl-safer.m4
index 7426fba6d4..6e8885d64b 100644
--- a/m4/fcntl-safer.m4
+++ b/m4/fcntl-safer.m4
@@ -1,4 +1,5 @@
-#serial 9
+# fcntl-safer.m4
+# serial 9
 dnl Copyright (C) 2005-2007, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4
index ba4eb4494d..b69f7a0ca8 100644
--- a/m4/fcntl_h.m4
+++ b/m4/fcntl_h.m4
@@ -1,10 +1,12 @@
+# fcntl_h.m4
 # serial 20
-# Configure fcntl.h.
 dnl Copyright (C) 2006-2007, 2009-2024 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.
 
+# Configure fcntl.h.
+
 dnl Written by Paul Eggert.
 
 AC_DEFUN_ONCE([gl_FCNTL_H],
diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4
index bf361ff154..e9268378d6 100644
--- a/m4/fdopendir.m4
+++ b/m4/fdopendir.m4
@@ -1,11 +1,12 @@
+# fdopendir.m4
 # serial 15
-# See if we need to provide fdopendir.
-
 dnl Copyright (C) 2009-2024 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.
 
+# See if we need to provide fdopendir.
+
 # Written by Eric Blake.
 
 AC_DEFUN([gl_FUNC_FDOPENDIR],
diff --git a/m4/fflush.m4 b/m4/fflush.m4
index 52ce52712e..43fc3bf346 100644
--- a/m4/fflush.m4
+++ b/m4/fflush.m4
@@ -1,10 +1,9 @@
 # fflush.m4
 # serial 19
-
-# Copyright (C) 2007-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2007-2024 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.
 
 dnl From Eric Blake
 
diff --git a/m4/flexmember.m4 b/m4/flexmember.m4
index 9df6c03cd3..73fb6142fa 100644
--- a/m4/flexmember.m4
+++ b/m4/flexmember.m4
@@ -1,10 +1,11 @@
+# flexmember.m4
 # serial 5
-# Check for flexible array member support.
+dnl Copyright (C) 2006, 2009-2024 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.
 
-# Copyright (C) 2006, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Check for flexible array member support.
 
 # Written by Paul Eggert.
 
diff --git a/m4/fpending.m4 b/m4/fpending.m4
index 05064b851e..9f2d83fb11 100644
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -1,9 +1,9 @@
+# fpending.m4
 # serial 23
-
-# Copyright (C) 2000-2001, 2004-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2000-2001, 2004-2024 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.
 
 dnl From Jim Meyering
 dnl Using code from emacs, based on suggestions from Paul Eggert
diff --git a/m4/free.m4 b/m4/free.m4
index 0f4b2a6c2b..a2b596d67f 100644
--- a/m4/free.m4
+++ b/m4/free.m4
@@ -1,9 +1,9 @@
 # free.m4
 # serial 6
-# Copyright (C) 2003-2005, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2003-2005, 2009-2024 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.
 
 # Written by Paul Eggert and Bruno Haible.
 
diff --git a/m4/fstypename.m4 b/m4/fstypename.m4
index fc5ab7a596..05a688051d 100644
--- a/m4/fstypename.m4
+++ b/m4/fstypename.m4
@@ -1,4 +1,10 @@
-#serial 6
+# fstypename.m4
+# serial 6
+dnl Copyright (C) 1998-1999, 2001, 2004, 2006, 2009-2024 Free Software
+dnl 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.
 
 dnl From Jim Meyering.
 dnl
@@ -6,12 +12,6 @@ dnl See if struct statfs has the f_fstypename member.
 dnl If so, define HAVE_STRUCT_STATFS_F_FSTYPENAME.
 dnl
 
-# Copyright (C) 1998-1999, 2001, 2004, 2006, 2009-2024 Free Software
-# Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 AC_DEFUN([gl_FSTYPENAME],
 [
   AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,
diff --git a/m4/fsusage.m4 b/m4/fsusage.m4
index 31d424c857..1ce9066085 100644
--- a/m4/fsusage.m4
+++ b/m4/fsusage.m4
@@ -1,11 +1,11 @@
+# fsusage.m4
 # serial 35
-# Obtaining file system usage information.
+dnl Copyright (C) 1997-1998, 2000-2001, 2003-2024 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.
 
-# Copyright (C) 1997-1998, 2000-2001, 2003-2024 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Obtaining file system usage information.
 
 # Written by Jim Meyering.
 
diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4
index f547a95d0b..0ecc0b3e40 100644
--- a/m4/ftruncate.m4
+++ b/m4/ftruncate.m4
@@ -1,12 +1,12 @@
+# ftruncate.m4
 # serial 24
+dnl Copyright (C) 2000-2001, 2003-2007, 2009-2024 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.
 
 # See if we need to emulate a missing ftruncate function using _chsize.
 
-# Copyright (C) 2000-2001, 2003-2007, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 AC_DEFUN([gl_FUNC_FTRUNCATE],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
diff --git a/m4/fts.m4 b/m4/fts.m4
index 6bacc967ad..18f88c4900 100644
--- a/m4/fts.m4
+++ b/m4/fts.m4
@@ -1,4 +1,5 @@
-#serial 24
+# fts.m4
+# serial 24
 dnl Copyright (C) 2005-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/futimens.m4 b/m4/futimens.m4
index ac961e7bde..b5f22605f4 100644
--- a/m4/futimens.m4
+++ b/m4/futimens.m4
@@ -1,11 +1,12 @@
+# futimens.m4
 # serial 11
-# See if we need to provide futimens replacement.
-
 dnl Copyright (C) 2009-2024 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.
 
+# See if we need to provide futimens replacement.
+
 # Written by Eric Blake.
 
 AC_DEFUN([gl_FUNC_FUTIMENS],
diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4
index 11f6a8a4c5..8ba5f81238 100644
--- a/m4/getcwd-abort-bug.m4
+++ b/m4/getcwd-abort-bug.m4
@@ -1,13 +1,14 @@
+# getcwd-abort-bug.m4
 # serial 16
+dnl Copyright (C) 2006, 2009-2024 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.
+
 # Determine whether getcwd aborts when the length of the working directory
 # name is unusually large.  Any length between 4k and 16k trigger the bug
 # when using glibc-2.4.90-9 or older.
 
-# Copyright (C) 2006, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 # From Jim Meyering
 
 # gl_FUNC_GETCWD_ABORT_BUG([ACTION-IF-BUGGY[, ACTION-IF-WORKS]])
diff --git a/m4/getcwd-path-max.m4 b/m4/getcwd-path-max.m4
index 424ad7714f..e9c52d90c9 100644
--- a/m4/getcwd-path-max.m4
+++ b/m4/getcwd-path-max.m4
@@ -1,4 +1,10 @@
+# getcwd-path-max.m4
 # serial 26
+dnl Copyright (C) 2003-2007, 2009-2024 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.
+
 # Check for several getcwd bugs with long file names.
 # If so, arrange to compile the wrapper function.
 
@@ -6,11 +12,6 @@
 # I've heard that this is due to a Linux kernel bug, and that it has
 # been fixed between 2.4.21-pre3 and 2.4.21-pre4.
 
-# Copyright (C) 2003-2007, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 # From Jim Meyering
 
 AC_DEFUN([gl_FUNC_GETCWD_PATH_MAX],
diff --git a/m4/getcwd.m4 b/m4/getcwd.m4
index ed3d7b610a..46f46a2f11 100644
--- a/m4/getcwd.m4
+++ b/m4/getcwd.m4
@@ -1,12 +1,13 @@
-# getcwd.m4 - check for working getcwd that is compatible with glibc
-
-# Copyright (C) 2001, 2003-2007, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# getcwd.m4
+# serial 22
+dnl Copyright (C) 2001, 2003-2007, 2009-2024 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.
 
 # Written by Paul Eggert.
-# serial 22
+
+# Check for working getcwd that is compatible with glibc
 
 AC_DEFUN([gl_FUNC_GETCWD_NULL],
   [
diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index f6e0cbd3fc..5457275e9e 100644
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -1,14 +1,13 @@
+# getgroups.m4
 # serial 25
+dnl Copyright (C) 1996-1997, 1999-2004, 2008-2024 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.
 
 dnl From Jim Meyering.
 dnl A wrapper around AC_FUNC_GETGROUPS.
 
-# Copyright (C) 1996-1997, 1999-2004, 2008-2024 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 # This is taken from the following Autoconf patch:
 # https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9
 AC_DEFUN([AC_FUNC_GETGROUPS],
diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4
index 9d0236f77f..0918bcd21e 100644
--- a/m4/getloadavg.m4
+++ b/m4/getloadavg.m4
@@ -1,13 +1,12 @@
-# Check for getloadavg.
-
-# Copyright (C) 1992-1996, 1999-2000, 2002-2003, 2006, 2008-2024 Free Software
-# Foundation, Inc.
+# getloadavg.m4
+# serial 13
+dnl Copyright (C) 1992-1996, 1999-2000, 2002-2003, 2006, 2008-2024 Free Software
+dnl 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.
 
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 13
+# Check for getloadavg.
 
 # Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent.
 # New applications should use gl_GETLOADAVG instead.
diff --git a/m4/getlogin_r.m4 b/m4/getlogin_r.m4
index f56b99a667..2038d62898 100644
--- a/m4/getlogin_r.m4
+++ b/m4/getlogin_r.m4
@@ -1,10 +1,9 @@
-#serial 15
-
-# Copyright (C) 2005-2007, 2009-2024 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# getlogin_r.m4
+# serial 15
+dnl Copyright (C) 2005-2007, 2009-2024 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.
 
 dnl From Derek Price
 dnl
diff --git a/m4/getprogname.m4 b/m4/getprogname.m4
index b8f9f230dd..b24f448055 100644
--- a/m4/getprogname.m4
+++ b/m4/getprogname.m4
@@ -1,11 +1,11 @@
-# getprogname.m4 - check for getprogname or replacements for it
-
-# Copyright (C) 2016-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
+# getprogname.m4
 # serial 8
+dnl Copyright (C) 2016-2024 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.
+
+# Check for getprogname or replacements for it
 
 AC_DEFUN([gl_FUNC_GETPROGNAME],
 [
diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
index 35269914ce..8135f89e58 100644
--- a/m4/gettimeofday.m4
+++ b/m4/gettimeofday.m4
@@ -1,9 +1,9 @@
+# gettimeofday.m4
 # serial 30
-
-# Copyright (C) 2001-2003, 2005, 2007, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2001-2003, 2005, 2007, 2009-2024 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.
 
 dnl From Jim Meyering.
 
diff --git a/m4/group-member.m4 b/m4/group-member.m4
index 60b3d526db..f8ceb1d818 100644
--- a/m4/group-member.m4
+++ b/m4/group-member.m4
@@ -1,10 +1,9 @@
+# group-member.m4
 # serial 14
-
-# Copyright (C) 1999-2001, 2003-2007, 2009-2024 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 1999-2001, 2003-2007, 2009-2024 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.
 
 dnl Written by Jim Meyering
 
diff --git a/m4/host-os.m4 b/m4/host-os.m4
index 32e3bc10f0..5ebe17125b 100644
--- a/m4/host-os.m4
+++ b/m4/host-os.m4
@@ -1,9 +1,9 @@
+# host-os.m4
 # serial 13
-
-# Copyright (C) 2001, 2003-2004, 2006, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2001, 2003-2004, 2006, 2009-2024 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.
 
 # Written by Paul Eggert.
 
diff --git a/m4/human.m4 b/m4/human.m4
index b9ca6ba74b..c6bba132c4 100644
--- a/m4/human.m4
+++ b/m4/human.m4
@@ -1,4 +1,5 @@
-#serial 11
+# human.m4
+# serial 11
 dnl Copyright (C) 2002-2006, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/i-ring.m4 b/m4/i-ring.m4
index 4ec03338d7..1b98f5252f 100644
--- a/m4/i-ring.m4
+++ b/m4/i-ring.m4
@@ -1,3 +1,4 @@
+# i-ring.m4
 # serial 2
 dnl Copyright (C) 2006, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
diff --git a/m4/inttostr.m4 b/m4/inttostr.m4
index 9dadae52a2..39e801302c 100644
--- a/m4/inttostr.m4
+++ b/m4/inttostr.m4
@@ -1,4 +1,5 @@
-#serial 8
+# inttostr.m4
+# serial 8
 dnl Copyright (C) 2004-2006, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4
index 5a9b29ae08..06cb6dd8a7 100644
--- a/m4/jm-winsz1.m4
+++ b/m4/jm-winsz1.m4
@@ -1,10 +1,9 @@
+# jm-winsz1.m4
 # serial 12
-
-# Copyright (C) 1996, 1999, 2001-2002, 2004, 2006, 2009-2024 Free Software
-# Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 1996, 1999, 2001-2002, 2004, 2006, 2009-2024 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.
 
 dnl From Jim Meyering and Paul Eggert.
 AC_DEFUN([gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H],
diff --git a/m4/jm-winsz2.m4 b/m4/jm-winsz2.m4
index 10cc88ec55..ed5177cf53 100644
--- a/m4/jm-winsz2.m4
+++ b/m4/jm-winsz2.m4
@@ -1,10 +1,9 @@
+# jm-winsz2.m4
 # serial 8
-
-# Copyright (C) 1996, 1999, 2001, 2004, 2009-2024 Free Software Foundation,
-# Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 1996, 1999, 2001, 2004, 2009-2024 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.
 
 AC_DEFUN([gl_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL],
 [AC_REQUIRE([gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H])
diff --git a/m4/lchmod.m4 b/m4/lchmod.m4
index 7b263a241e..797cb44693 100644
--- a/m4/lchmod.m4
+++ b/m4/lchmod.m4
@@ -1,5 +1,5 @@
-#serial 10
-
+# lchmod.m4
+# serial 10
 dnl Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/lchown.m4 b/m4/lchown.m4
index 91a8c545c5..ed9f03fc51 100644
--- a/m4/lchown.m4
+++ b/m4/lchown.m4
@@ -1,13 +1,12 @@
+# lchown.m4
 # serial 17
-# Determine whether we need the lchown wrapper.
-
-dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2024 Free Software Foundation,
-dnl Inc.
-
+dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2024 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.
 
+# Determine whether we need the lchown wrapper.
+
 dnl From Jim Meyering.
 dnl Provide lchown on systems that lack it, and work around bugs
 dnl on systems that have it.
diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
index 826471130a..39ab36a75e 100644
--- a/m4/link-follow.m4
+++ b/m4/link-follow.m4
@@ -1,12 +1,13 @@
+# link-follow.m4
 # serial 21
+dnl Copyright (C) 1999-2001, 2004-2006, 2009-2024 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.
+
 dnl Run a program to determine whether link(2) follows symlinks.
 dnl Set LINK_FOLLOWS_SYMLINKS accordingly.
 
-# Copyright (C) 1999-2001, 2004-2006, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 dnl This macro can be used to emulate POSIX linkat.  If
 dnl LINK_FOLLOWS_SYMLINKS is 0, link matches linkat(,0), and
 dnl linkat(,AT_SYMLINK_FOLLOW) requires a readlink. If it is 1,
diff --git a/m4/linkat.m4 b/m4/linkat.m4
index c5f925b31c..7725dff3a8 100644
--- a/m4/linkat.m4
+++ b/m4/linkat.m4
@@ -1,11 +1,12 @@
+# linkat.m4
 # serial 17
-# See if we need to provide linkat replacement.
-
 dnl Copyright (C) 2009-2024 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.
 
+# See if we need to provide linkat replacement.
+
 # Written by Eric Blake.
 
 AC_DEFUN([gl_FUNC_LINKAT],
diff --git a/m4/lstat.m4 b/m4/lstat.m4
index 48cc8653fe..f838e2cc1e 100644
--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -1,10 +1,9 @@
+# lstat.m4
 # serial 36
-
-# Copyright (C) 1997-2001, 2003-2024 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 1997-2001, 2003-2024 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.
 
 dnl From Jim Meyering.
 
diff --git a/m4/memcasecmp.m4 b/m4/memcasecmp.m4
index debca971ab..facf87371b 100644
--- a/m4/memcasecmp.m4
+++ b/m4/memcasecmp.m4
@@ -1,4 +1,5 @@
-#serial 6
+# memcasecmp.m4
+# serial 6
 dnl Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/mgetgroups.m4 b/m4/mgetgroups.m4
index 03e60a8f0f..7616e4877e 100644
--- a/m4/mgetgroups.m4
+++ b/m4/mgetgroups.m4
@@ -1,4 +1,5 @@
-#serial 5
+# mgetgroups.m4
+# serial 5
 dnl Copyright (C) 2007-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/mkdir.m4 b/m4/mkdir.m4
index 48297f9040..894cab7203 100644
--- a/m4/mkdir.m4
+++ b/m4/mkdir.m4
@@ -1,9 +1,9 @@
+# mkdir.m4
 # serial 20
-
-# Copyright (C) 2001, 2003-2004, 2006, 2008-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2001, 2003-2004, 2006, 2008-2024 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.
 
 # On some systems, mkdir ("foo/", 0700) fails because of the trailing slash.
 # On others, mkdir ("foo/./", 0700) mistakenly succeeds.
diff --git a/m4/mkfifo.m4 b/m4/mkfifo.m4
index c49c68822f..7a6c224d23 100644
--- a/m4/mkfifo.m4
+++ b/m4/mkfifo.m4
@@ -1,11 +1,12 @@
+# mkfifo.m4
 # serial 9
-# See if we need to provide mkfifo replacement.
-
 dnl Copyright (C) 2009-2024 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.
 
+# See if we need to provide mkfifo replacement.
+
 # Written by Eric Blake.
 
 AC_DEFUN([gl_FUNC_MKFIFO],
diff --git a/m4/mkfifoat.m4 b/m4/mkfifoat.m4
index e1d1547aef..9efffd58bb 100644
--- a/m4/mkfifoat.m4
+++ b/m4/mkfifoat.m4
@@ -1,11 +1,12 @@
+# mkfifoat.m4
 # serial 10
-# See if we need to provide mkfifoat/mknodat replacement.
-
 dnl Copyright (C) 2009-2024 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.
 
+# See if we need to provide mkfifoat/mknodat replacement.
+
 # Written by Eric Blake.
 
 AC_DEFUN([gl_FUNC_MKFIFOAT],
diff --git a/m4/mknod.m4 b/m4/mknod.m4
index d342211e09..e86ad593f5 100644
--- a/m4/mknod.m4
+++ b/m4/mknod.m4
@@ -1,11 +1,12 @@
+# mknod.m4
 # serial 8
-# See if we need to provide mknod replacement.
-
 dnl Copyright (C) 2009-2024 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.
 
+# See if we need to provide mknod replacement.
+
 # Written by Eric Blake.
 
 AC_DEFUN([gl_FUNC_MKNOD],
diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4
index 106a6b8e5f..311e6afd45 100644
--- a/m4/mkstemp.m4
+++ b/m4/mkstemp.m4
@@ -1,9 +1,9 @@
-#serial 30
-
-# Copyright (C) 2001, 2003-2007, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# mkstemp.m4
+# serial 30
+dnl Copyright (C) 2001, 2003-2007, 2009-2024 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.
 
 # On some hosts (e.g., HP-UX 10.20, SunOS 4.1.4, Solaris 2.5.1), mkstemp has a
 # silly limit that it can create no more than 26 files from a given template.
diff --git a/m4/mktime.m4 b/m4/mktime.m4
index 0565e5e61f..85c52454aa 100644
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -1,6 +1,6 @@
+# mktime.m4
 # serial 39
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2024 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2024 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.
diff --git a/m4/mountlist.m4 b/m4/mountlist.m4
index a5ae8812d8..ff414e66a6 100644
--- a/m4/mountlist.m4
+++ b/m4/mountlist.m4
@@ -1,3 +1,4 @@
+# mountlist.m4
 # serial 17
 dnl Copyright (C) 2002-2006, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index ff730b676c..a7281b8ac5 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,15 +1,13 @@
+# nanosleep.m4
 # serial 47
+dnl Copyright (C) 1999-2001, 2003-2024 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.
 
 dnl From Jim Meyering.
 dnl Check for the nanosleep function.
 dnl If not found, use the supplied replacement.
-dnl
-
-# Copyright (C) 1999-2001, 2003-2024 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_NANOSLEEP],
 [
diff --git a/m4/nstrftime.m4 b/m4/nstrftime.m4
index aa5d63a54b..f73bca40ec 100644
--- a/m4/nstrftime.m4
+++ b/m4/nstrftime.m4
@@ -1,10 +1,9 @@
+# nstrftime.m4
 # serial 38
-
-# Copyright (C) 1996-1997, 1999-2007, 2009-2024 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 1996-1997, 1999-2007, 2009-2024 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.
 
 # Written by Jim Meyering and Paul Eggert.
 
diff --git a/m4/openat.m4 b/m4/openat.m4
index 47cd93c8c6..e91f58f4af 100644
--- a/m4/openat.m4
+++ b/m4/openat.m4
@@ -1,11 +1,12 @@
+# openat.m4
 # serial 46
-# See if we need to use our replacement for Solaris' openat et al functions.
-
 dnl Copyright (C) 2004-2024 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.
 
+# See if we need to use our replacement for Solaris' openat et al functions.
+
 # Written by Jim Meyering.
 
 AC_DEFUN([gl_FUNC_OPENAT],
diff --git a/m4/pagealign_alloc.m4 b/m4/pagealign_alloc.m4
index ab5c08d7bc..ed23506b9e 100644
--- a/m4/pagealign_alloc.m4
+++ b/m4/pagealign_alloc.m4
@@ -1,4 +1,5 @@
-#serial 7
+# pagealign_alloc.m4
+# serial 7
 dnl Copyright (C) 2005-2007, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/perl.m4 b/m4/perl.m4
index 51a3c21524..f4218e6304 100644
--- a/m4/perl.m4
+++ b/m4/perl.m4
@@ -1,15 +1,13 @@
+# perl.m4
 # serial 11
+dnl Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2024 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.
 
 dnl From Jim Meyering.
 dnl Find a new-enough version of Perl.
 
-# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2024 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 AC_DEFUN([gl_PERL],
 [
   dnl FIXME: don't hard-code 5.005
diff --git a/m4/priv-set.m4 b/m4/priv-set.m4
index bbdce660eb..d9e3eb5d8b 100644
--- a/m4/priv-set.m4
+++ b/m4/priv-set.m4
@@ -1,10 +1,9 @@
+# priv-set.m4
 # serial 8
-
-# Copyright (C) 2009-2024 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2009-2024 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.
 
 # Written by David Bartley.
 
diff --git a/m4/random_r.m4 b/m4/random_r.m4
index 6c5457e9f5..b2464fdab9 100644
--- a/m4/random_r.m4
+++ b/m4/random_r.m4
@@ -1,3 +1,4 @@
+# random_r.m4
 # serial 5
 dnl Copyright (C) 2008-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
diff --git a/m4/readlinkat.m4 b/m4/readlinkat.m4
index 9982210229..8a33c16913 100644
--- a/m4/readlinkat.m4
+++ b/m4/readlinkat.m4
@@ -1,11 +1,12 @@
+# readlinkat.m4
 # serial 8
-# See if we need to provide readlinkat replacement.
-
 dnl Copyright (C) 2009-2024 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.
 
+# See if we need to provide readlinkat replacement.
+
 # Written by Eric Blake.
 
 AC_DEFUN([gl_FUNC_READLINKAT],
diff --git a/m4/regex.m4 b/m4/regex.m4
index 3dfeabea05..f0101fe67c 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,10 +1,9 @@
+# regex.m4
 # serial 75
-
-# Copyright (C) 1996-2001, 2003-2024 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 1996-2001, 2003-2024 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.
 
 dnl Initially derived from code in GNU grep.
 dnl Mostly written by Jim Meyering.
diff --git a/m4/rename.m4 b/m4/rename.m4
index 757cc27b2a..e9be4b55d7 100644
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -1,9 +1,9 @@
+# rename.m4
 # serial 37
-
-# Copyright (C) 2001, 2003, 2005-2006, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2001, 2003, 2005-2006, 2009-2024 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.
 
 dnl From Volker Borchert.
 dnl Determine whether rename works for source file names with a trailing slash.
diff --git a/m4/renameat.m4 b/m4/renameat.m4
index 41bfc6e3bb..565400f5db 100644
--- a/m4/renameat.m4
+++ b/m4/renameat.m4
@@ -1,11 +1,12 @@
+# renameat.m4
 # serial 4
-# See if we need to provide renameat replacement.
-
 dnl Copyright (C) 2009-2024 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.
 
+# See if we need to provide renameat replacement.
+
 # Written by Eric Blake.
 
 AC_DEFUN([gl_FUNC_RENAMEAT],
diff --git a/m4/rmdir-errno.m4 b/m4/rmdir-errno.m4
index f2dffa6294..d863eb0dda 100644
--- a/m4/rmdir-errno.m4
+++ b/m4/rmdir-errno.m4
@@ -1,9 +1,9 @@
+# rmdir-errno.m4
 # serial 16
-
-# Copyright (C) 2000-2001, 2005-2006, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2000-2001, 2005-2006, 2009-2024 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.
 
 # When rmdir fails because the specified directory is not empty, it sets
 # errno to some value, usually ENOTEMPTY.  However, on some AIX systems,
diff --git a/m4/same.m4 b/m4/same.m4
index b3bc50fba3..bc2dcad4eb 100644
--- a/m4/same.m4
+++ b/m4/same.m4
@@ -1,6 +1,6 @@
-#serial 10
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2024 Free Software Foundation,
-dnl Inc.
+# same.m4
+# serial 10
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2024 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.
diff --git a/m4/save-cwd.m4 b/m4/save-cwd.m4
index f1ac3456f3..bb54a0eb7b 100644
--- a/m4/save-cwd.m4
+++ b/m4/save-cwd.m4
@@ -1,3 +1,4 @@
+# save-cwd.m4
 # serial 10
 dnl Copyright (C) 2002-2006, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
diff --git a/m4/selinux-context-h.m4 b/m4/selinux-context-h.m4
index de2e6b7d15..ec898c4051 100644
--- a/m4/selinux-context-h.m4
+++ b/m4/selinux-context-h.m4
@@ -1,8 +1,9 @@
+# selinux-context-h.m4
 # serial 4   -*- Autoconf -*-
-# Copyright (C) 2006-2007, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2006-2007, 2009-2024 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.
 
 # From Jim Meyering
 # Provide <selinux/context.h>, if necessary.
diff --git a/m4/selinux-selinux-h.m4 b/m4/selinux-selinux-h.m4
index bdbe003c39..91fdc434f2 100644
--- a/m4/selinux-selinux-h.m4
+++ b/m4/selinux-selinux-h.m4
@@ -1,8 +1,9 @@
+# selinux-selinux-h.m4
 # serial 8   -*- Autoconf -*-
-# Copyright (C) 2006-2007, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2006-2007, 2009-2024 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.
 
 # From Jim Meyering
 # Provide <selinux/selinux.h>, if necessary.
diff --git a/m4/sig2str.m4 b/m4/sig2str.m4
index ab3786b895..096d0253fc 100644
--- a/m4/sig2str.m4
+++ b/m4/sig2str.m4
@@ -1,3 +1,4 @@
+# sig2str.m4
 # serial 7
 dnl Copyright (C) 2002, 2005-2006, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
diff --git a/m4/stat-size.m4 b/m4/stat-size.m4
index 334f6e9a81..d30a072f07 100644
--- a/m4/stat-size.m4
+++ b/m4/stat-size.m4
@@ -1,10 +1,9 @@
-#serial 1
-
-# Copyright (C) 2011-2024 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# stat-size.m4
+# serial 1
+dnl Copyright (C) 2011-2024 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.
 
 AC_DEFUN([gl_STAT_SIZE],
 [
diff --git a/m4/stat.m4 b/m4/stat.m4
index 1d2a9e2ca2..fabd360c7a 100644
--- a/m4/stat.m4
+++ b/m4/stat.m4
@@ -1,10 +1,9 @@
+# stat.m4
 # serial 21
-
-# Copyright (C) 2009-2024 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2009-2024 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.
 
 AC_DEFUN([gl_FUNC_STAT],
 [
diff --git a/m4/stdbool.m4 b/m4/stdbool.m4
index fd422e5615..d0339dae24 100644
--- a/m4/stdbool.m4
+++ b/m4/stdbool.m4
@@ -1,11 +1,11 @@
-# Check for stdbool.h that conforms to C99.
-
+# stdbool.m4
+# serial 10
 dnl Copyright (C) 2002-2006, 2009-2024 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.
 
-#serial 10
+# Check for stdbool.h that conforms to C99.
 
 # Prepare for substituting <stdbool.h> if it is not supported.
 
diff --git a/m4/string_h.m4 b/m4/string_h.m4
index 9ea748cc77..f31264ae85 100644
--- a/m4/string_h.m4
+++ b/m4/string_h.m4
@@ -1,11 +1,11 @@
-# Configure a GNU-like replacement for <string.h>.
-
-# Copyright (C) 2007-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
+# string_h.m4
 # serial 39
+dnl Copyright (C) 2007-2024 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.
+
+# Configure a GNU-like replacement for <string.h>.
 
 # Written by Paul Eggert.
 
diff --git a/m4/strings_h.m4 b/m4/strings_h.m4
index 37b6ca9b44..aaafb55966 100644
--- a/m4/strings_h.m4
+++ b/m4/strings_h.m4
@@ -1,10 +1,11 @@
-# Configure a replacement for <strings.h>.
+# strings_h.m4
 # serial 9
+dnl Copyright (C) 2007, 2009-2024 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.
 
-# Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Configure a replacement for <strings.h>.
 
 AC_DEFUN_ONCE([gl_STRINGS_H],
 [
diff --git a/m4/symlink.m4 b/m4/symlink.m4
index 62062cf149..47968a1d33 100644
--- a/m4/symlink.m4
+++ b/m4/symlink.m4
@@ -1,11 +1,12 @@
+# symlink.m4
 # serial 10
-# See if we need to provide symlink replacement.
-
 dnl Copyright (C) 2009-2024 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.
 
+# See if we need to provide symlink replacement.
+
 # Written by Eric Blake.
 
 AC_DEFUN([gl_FUNC_SYMLINK],
diff --git a/m4/symlinkat.m4 b/m4/symlinkat.m4
index afc045d4f5..0af516ab68 100644
--- a/m4/symlinkat.m4
+++ b/m4/symlinkat.m4
@@ -1,11 +1,12 @@
+# symlinkat.m4
 # serial 13
-# See if we need to provide symlinkat replacement.
-
 dnl Copyright (C) 2009-2024 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.
 
+# See if we need to provide symlinkat replacement.
+
 # Written by Eric Blake.
 
 AC_DEFUN([gl_FUNC_SYMLINKAT],
diff --git a/m4/sys_file_h.m4 b/m4/sys_file_h.m4
index f56a1330d5..011429e166 100644
--- a/m4/sys_file_h.m4
+++ b/m4/sys_file_h.m4
@@ -1,10 +1,11 @@
-# Configure a replacement for <sys/file.h>.
+# sys_file_h.m4
 # serial 9
+dnl Copyright (C) 2008-2024 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.
 
-# Copyright (C) 2008-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Configure a replacement for <sys/file.h>.
 
 # Written by Richard W.M. Jones.
 
diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4
index dc5353f378..d320308893 100644
--- a/m4/sys_time_h.m4
+++ b/m4/sys_time_h.m4
@@ -1,10 +1,11 @@
-# Configure a replacement for <sys/time.h>.
+# sys_time_h.m4
 # serial 12
+dnl Copyright (C) 2007, 2009-2024 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.
 
-# Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Configure a replacement for <sys/time.h>.
 
 # Written by Paul Eggert and Martin Lambers.
 
diff --git a/m4/sys_times_h.m4 b/m4/sys_times_h.m4
index 56b3bda8f7..df2d8cea94 100644
--- a/m4/sys_times_h.m4
+++ b/m4/sys_times_h.m4
@@ -1,10 +1,11 @@
-# Configure a replacement for <sys/times.h>.
+# sys_times_h.m4
 # serial 11
+dnl Copyright (C) 2008-2024 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.
 
-# Copyright (C) 2008-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Configure a replacement for <sys/times.h>.
 
 # Written by Simon Josefsson.
 
diff --git a/m4/tempname.m4 b/m4/tempname.m4
index 31d35c83eb..795a9803fd 100644
--- a/m4/tempname.m4
+++ b/m4/tempname.m4
@@ -1,9 +1,9 @@
-#serial 5
-
-# Copyright (C) 2006-2007, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# tempname.m4
+# serial 5
+dnl Copyright (C) 2006-2007, 2009-2024 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.
 
 # glibc provides __gen_tempname as a wrapper for mk[ds]temp.  Expose
 # it as a public API, and provide it on systems that are lacking.
diff --git a/m4/time_h.m4 b/m4/time_h.m4
index 32fade0f40..d2f3c9701c 100644
--- a/m4/time_h.m4
+++ b/m4/time_h.m4
@@ -1,12 +1,11 @@
-# Configure a more-standard replacement for <time.h>.
-
-# Copyright (C) 2000-2001, 2003-2007, 2009-2024 Free Software Foundation, Inc.
-
+# time_h.m4
 # serial 25
+dnl Copyright (C) 2000-2001, 2003-2007, 2009-2024 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.
 
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Configure a more-standard replacement for <time.h>.
 
 # Written by Paul Eggert and Jim Meyering.
 
diff --git a/m4/timespec.m4 b/m4/timespec.m4
index 59a0db9966..5333920ef5 100644
--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -1,10 +1,9 @@
-#serial 15
-
-# Copyright (C) 2000-2001, 2003-2007, 2009-2024 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# timespec.m4
+# serial 15
+dnl Copyright (C) 2000-2001, 2003-2007, 2009-2024 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.
 
 dnl From Jim Meyering
 
diff --git a/m4/tmpfile.m4 b/m4/tmpfile.m4
index 400e8fc1b2..5966f73c04 100644
--- a/m4/tmpfile.m4
+++ b/m4/tmpfile.m4
@@ -1,9 +1,9 @@
 # tmpfile.m4
 # serial 4
-# Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2007, 2009-2024 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.
 
 # Written by Ben Pfaff.
 
diff --git a/m4/tzset.m4 b/m4/tzset.m4
index d220534dd5..4d14804e73 100644
--- a/m4/tzset.m4
+++ b/m4/tzset.m4
@@ -1,9 +1,9 @@
+# tzset.m4
 # serial 18
-
-# Copyright (C) 2003, 2007, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2003, 2007, 2009-2024 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.
 
 # Written by Paul Eggert and Jim Meyering.
 
diff --git a/m4/unistd-safer.m4 b/m4/unistd-safer.m4
index 9d50964840..429d44a7ec 100644
--- a/m4/unistd-safer.m4
+++ b/m4/unistd-safer.m4
@@ -1,4 +1,5 @@
-#serial 9
+# unistd-safer.m4
+# serial 9
 dnl Copyright (C) 2002, 2005-2006, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/unlink-busy.m4 b/m4/unlink-busy.m4
index e7cb903d1f..dfd8b10abf 100644
--- a/m4/unlink-busy.m4
+++ b/m4/unlink-busy.m4
@@ -1,14 +1,14 @@
-#serial 17
+# unlink-busy.m4
+# serial 17
+dnl Copyright (C) 2000-2001, 2004, 2007, 2009-2024 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.
 
 dnl From J. David Anglin.
 
 dnl HPUX and other systems can't unlink shared text that is being executed.
 
-# Copyright (C) 2000-2001, 2004, 2007, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 AC_DEFUN([gl_FUNC_UNLINK_BUSY_TEXT],
 [
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4
index baa3c0fc09..ae5c93abd9 100644
--- a/m4/unlinkdir.m4
+++ b/m4/unlinkdir.m4
@@ -1,10 +1,9 @@
+# unlinkdir.m4
 # serial 8
-
-# Copyright (C) 2005-2007, 2009-2024 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2005-2007, 2009-2024 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.
 
 # Written by Paul Eggert.
 
diff --git a/m4/unlocked-io.m4 b/m4/unlocked-io.m4
index bdb12e19b9..e96cf5f873 100644
--- a/m4/unlocked-io.m4
+++ b/m4/unlocked-io.m4
@@ -1,11 +1,9 @@
 # unlocked-io.m4
 # serial 16
-
-# Copyright (C) 1998-2006, 2009-2024 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 1998-2006, 2009-2024 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.
 
 dnl From Jim Meyering.
 dnl
diff --git a/m4/uptime.m4 b/m4/uptime.m4
index a6403875b1..d8f27dc484 100644
--- a/m4/uptime.m4
+++ b/m4/uptime.m4
@@ -1,9 +1,9 @@
+# uptime.m4
 # serial 8
-
-# Copyright (C) 1996, 1999-2001, 2004, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 1996, 1999-2001, 2004, 2009-2024 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.
 
 AC_PREREQ([2.13])
 
diff --git a/m4/userspec.m4 b/m4/userspec.m4
index 05f4ac2f3e..5b5b95e157 100644
--- a/m4/userspec.m4
+++ b/m4/userspec.m4
@@ -1,3 +1,4 @@
+# userspec.m4
 # serial 11
 dnl Copyright (C) 2002-2006, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
diff --git a/m4/utimecmp.m4 b/m4/utimecmp.m4
index f76e6afd33..4c2314ac1c 100644
--- a/m4/utimecmp.m4
+++ b/m4/utimecmp.m4
@@ -1,4 +1,5 @@
-#serial 4
+# utimecmp.m4
+# serial 4
 dnl Copyright (C) 2004-2007, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/utimensat.m4 b/m4/utimensat.m4
index 4af7f6f81c..a583f37668 100644
--- a/m4/utimensat.m4
+++ b/m4/utimensat.m4
@@ -1,11 +1,12 @@
+# utimensat.m4
 # serial 12
-# See if we need to provide utimensat replacement.
-
 dnl Copyright (C) 2009-2024 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.
 
+# See if we need to provide utimensat replacement.
+
 # Written by Eric Blake.
 
 AC_DEFUN([gl_FUNC_UTIMENSAT],
diff --git a/m4/utmp_h.m4 b/m4/utmp_h.m4
index c9ff377ca4..660c47d097 100644
--- a/m4/utmp_h.m4
+++ b/m4/utmp_h.m4
@@ -1,11 +1,11 @@
-# Configure a GNU-like replacement for <utmp.h>.
-
-# Copyright (C) 2023-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
+# utmp_h.m4
 # serial 2
+dnl Copyright (C) 2023-2024 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.
+
+# Configure a GNU-like replacement for <utmp.h>.
 
 AC_DEFUN_ONCE([gl_UTMP_H],
 [
diff --git a/m4/vararrays.m4 b/m4/vararrays.m4
index 164bf0c49a..9211f69d4d 100644
--- a/m4/vararrays.m4
+++ b/m4/vararrays.m4
@@ -1,13 +1,13 @@
-# Check for variable-length arrays.
-
+# vararrays.m4
 # serial 6
+dnl Copyright (C) 2001, 2009-2024 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.
 
-# From Paul Eggert
+# Check for variable-length arrays.
 
-# Copyright (C) 2001, 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# From Paul Eggert
 
 m4_version_prereq([2.70], [], [
 
diff --git a/m4/version-etc.m4 b/m4/version-etc.m4
index 5a97b5a2c2..6ab1ed621c 100644
--- a/m4/version-etc.m4
+++ b/m4/version-etc.m4
@@ -1,9 +1,9 @@
 # version-etc.m4
 # serial 2
-# Copyright (C) 2009-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 2009-2024 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.
 
 dnl $1 - configure flag and define name
 dnl $2 - human readable description
diff --git a/m4/xattr.m4 b/m4/xattr.m4
index 7f72a81eea..d8c0848683 100644
--- a/m4/xattr.m4
+++ b/m4/xattr.m4
@@ -1,10 +1,11 @@
-# xattr.m4 - check for Extended Attributes (Linux)
+# xattr.m4
 # serial 7
+dnl Copyright (C) 2003-2024 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.
 
-# Copyright (C) 2003-2024 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Check for Extended Attributes (Linux)
 
 AC_DEFUN([gl_FUNC_XATTR],
 [
diff --git a/m4/xgetcwd.m4 b/m4/xgetcwd.m4
index 909bbe80e1..1bb9569239 100644
--- a/m4/xgetcwd.m4
+++ b/m4/xgetcwd.m4
@@ -1,4 +1,5 @@
-#serial 8
+# xgetcwd.m4
+# serial 8
 dnl Copyright (C) 2002-2006, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/xnanosleep.m4 b/m4/xnanosleep.m4
index 54d296abff..0227dad044 100644
--- a/m4/xnanosleep.m4
+++ b/m4/xnanosleep.m4
@@ -1,4 +1,5 @@
-#serial 6
+# xnanosleep.m4
+# serial 6
 dnl Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/xstrtod.m4 b/m4/xstrtod.m4
index 49bcb29789..d0fe550c3b 100644
--- a/m4/xstrtod.m4
+++ b/m4/xstrtod.m4
@@ -1,4 +1,5 @@
-#serial 8
+# xstrtod.m4
+# serial 8
 dnl Copyright (C) 2002-2003, 2005-2006, 2009-2024 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
diff --git a/m4/xstrtol.m4 b/m4/xstrtol.m4
index 9a53618967..20f1de1498 100644
--- a/m4/xstrtol.m4
+++ b/m4/xstrtol.m4
@@ -1,4 +1,5 @@
-#serial 11
+# xstrtol.m4
+# serial 11
 dnl Copyright (C) 2002-2007, 2009-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,