Use an all-permissive copyright notice, recommended by RMS.

2026-02-16 04:12:26 +02:00 · 2005-01-23 09:07:57 +00:00
parent 908a461e32
commit 65ef46a51c
141 changed files with 697 additions and 808 deletions
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,40 @@
+2005-01-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Sync from gnulib.
+	* acl.m4, afs.m4, alloca.m4, assert.m4, atexit.m4,
+	backupfile.m4, bison.m4, c-strtod.m4, calloc.m4,
+	canon-host.m4, canonicalize.m4, clock_time.m4, cloexec.m4,
+	closeout.m4, d-ino.m4, d-type.m4, dirfd.m4, dirname.m4,
+	dos.m4, dup2.m4, error.m4, euidaccess.m4, exclude.m4,
+	exitfail.m4, extensions.m4, fcntl-safer.m4, file-type.m4,
+	fileblocks.m4, filemode.m4, fnmatch.m4, fpending.m4, free.m4,
+	fstypename.m4, fsusage.m4, ftruncate.m4, getcwd-path-max.m4,
+	getcwd.m4, getdate.m4, getgroups.m4, gethostname.m4,
+	getline.m4, getndelim2.m4, getopt.m4, getpagesize.m4,
+	getpass.m4, gettime.m4, gettimeofday.m4, getugroups.m4,
+	getusershell.m4, group-member.m4, hard-locale.m4, hash.m4,
+	host-os.m4, human.m4, idcache.m4, inttostr.m4, jm-winsz1.m4,
+	jm-winsz2.m4, link-follow.m4, long-options.m4, ls-mntd-fs.m4,
+	lstat.m4, makepath.m4, md5.m4, memchr.m4, memcmp.m4,
+	memcoll.m4, memcpy.m4, memmove.m4, memrchr.m4, memset.m4,
+	mkdir-slash.m4, mkstemp.m4, mktime.m4, modechange.m4,
+	mountlist.m4, nanosleep.m4, obstack.m4, path-concat.m4,
+	pathmax.m4, perl.m4, physmem.m4, posixtm.m4, posixver.m4,
+	putenv.m4, quote.m4, quotearg.m4, readdir.m4, readtokens.m4,
+	readutmp.m4, regex.m4, rename.m4, restrict.m4, rmdir-errno.m4,
+	rmdir.m4, rpmatch.m4, same.m4, savedir.m4, settime.m4,
+	sha1.m4, sig2str.m4, st_dm_mode.m4, st_mtim.m4, stat.m4,
+	stdio-safer.m4, strdup.m4, strftime.m4, strndup.m4,
+	strnlen.m4, strtod.m4, strtoimax.m4, strtol.m4, strtoll.m4,
+	strtoul.m4, strtoull.m4, strtoumax.m4, strverscmp.m4,
+	timespec.m4, tm_gmtoff.m4, tzset.m4, uint32_t.m4,
+	uintptr_t.m4, unistd-safer.m4, unlink-busy.m4, unlocked-io.m4,
+	uptime.m4, userspec.m4, utimbuf.m4, utime.m4, utimecmp.m4,
+	utimens.m4, utimes-null.m4, xalloc.m4, xgetcwd.m4,
+	xreadlink.m4, xstrtod.m4, xstrtoimax.m4, xstrtol.m4,
+	xstrtoumax.m4, yesno.m4:
+	Use an all-permissive copyright notice, recommended by RMS.
+
 2005-01-21  Bruno Haible  <bruno@clisp.org>

 	Sync from gnulib.
--- a/m4/acl.m4
+++ b/m4/acl.m4
@@ -1,20 +1,9 @@
 # acl.m4 - check for access control list (ACL) primitives

-# Copyright (C) 2002 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Copyright (C) 2002, 2004 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.

 # Written by Paul Eggert.

--- a/m4/afs.m4
+++ b/m4/afs.m4
@@ -1,4 +1,9 @@
-#serial 7
+#serial 8
+
+# Copyright (C) 1999, 2000, 2001, 2004 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_AFS],
  [
--- a/m4/alloca.m4
+++ b/m4/alloca.m4
@@ -1,10 +1,8 @@
-# alloca.m4 serial 4
+# alloca.m4 serial 5
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_ALLOCA],
 [
--- a/m4/assert.m4
+++ b/m4/assert.m4
@@ -1,4 +1,10 @@
-#serial 4
+#serial 5
+
+# Copyright (C) 1998, 1999, 2001, 2004 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 based on code from Eleftherios Gkioulekas

 AC_DEFUN([gl_ASSERT],
--- a/m4/atexit.m4
+++ b/m4/atexit.m4
@@ -1,10 +1,8 @@
-# atexit.m4 serial 1
+# atexit.m4 serial 2
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_ATEXIT],
 [
--- a/m4/backupfile.m4
+++ b/m4/backupfile.m4
@@ -1,10 +1,8 @@
-# backupfile.m4 serial 5
+# backupfile.m4 serial 6
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_BACKUPFILE],
 [
--- a/m4/bison.m4
+++ b/m4/bison.m4
@@ -1,4 +1,9 @@
-#serial 3
+#serial 4
+
+# Copyright (C) 2002 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_BISON],
 [
--- a/m4/c-strtod.m4
+++ b/m4/c-strtod.m4
@@ -1,20 +1,9 @@
-# c-strtod.m4 serial 4
+# c-strtod.m4 serial 5

 # Copyright (C) 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 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.

 # Written by Paul Eggert.

--- a/m4/calloc.m4
+++ b/m4/calloc.m4
@@ -1,20 +1,9 @@
-# calloc.m4 serial 3
+# calloc.m4 serial 4

 # Copyright (C) 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 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.

 # Written by Jim Meyering.

--- a/m4/canon-host.m4
+++ b/m4/canon-host.m4
@@ -1,10 +1,8 @@
-# canon-host.m4 serial 4
+# canon-host.m4 serial 5
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_CANON_HOST],
 [
--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -1,20 +1,9 @@
-#serial 3
+#serial 4

 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 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.

 # Written by Jim Meyering.

--- a/m4/clock_time.m4
+++ b/m4/clock_time.m4
@@ -1,10 +1,8 @@
-# clock_time.m4 serial 4
+# clock_time.m4 serial 5
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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 clock_gettime and clock_settime, and sets LIB_CLOCK_GETTIME.
 AC_DEFUN([gl_CLOCK_TIME],
--- a/m4/cloexec.m4
+++ b/m4/cloexec.m4
@@ -1,10 +1,8 @@
-# cloexec.m4 serial 1
+# cloexec.m4 serial 2
 dnl Copyright (C) 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_CLOEXEC],
 [
--- a/m4/closeout.m4
+++ b/m4/closeout.m4
@@ -1,10 +1,8 @@
-# closeout.m4 serial 2
+# closeout.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_CLOSEOUT],
 [
--- a/m4/d-ino.m4
+++ b/m4/d-ino.m4
@@ -1,10 +1,17 @@
-#serial 6
+#serial 7

 dnl From Jim Meyering.
 dnl
 dnl Check whether struct dirent has a member named d_ino.
 dnl

+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004 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_HEADER_DIRENT])dnl
   AC_CACHE_CHECK([for d_ino member in directory struct],
--- a/m4/d-type.m4
+++ b/m4/d-type.m4
@@ -1,10 +1,17 @@
-#serial 7
+#serial 8

 dnl From Jim Meyering.
 dnl
 dnl Check whether struct dirent has a member named d_type.
 dnl

+# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004 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_REQUIRE([AC_HEADER_DIRENT])dnl
   AC_CACHE_CHECK([for d_type member in directory struct],
--- a/m4/dirfd.m4
+++ b/m4/dirfd.m4
@@ -1,6 +1,12 @@
-#serial 8
+#serial 9

 dnl Find out how to get the file descriptor associated with an open DIR*.
+
+# Copyright (C) 2001, 2002, 2003, 2004 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],
--- a/m4/dirname.m4
+++ b/m4/dirname.m4
@@ -1,10 +1,8 @@
-# dirname.m4 serial 3
+# dirname.m4 serial 4
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_DIRNAME],
 [
--- a/m4/dos.m4
+++ b/m4/dos.m4
@@ -1,24 +1,12 @@
-#serial 8
+#serial 9

 # Define some macros required for proper operation of code in lib/*.c
 # on MSDOS/Windows systems.

 # Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# 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.

--- a/m4/dup2.m4
+++ b/m4/dup2.m4
@@ -1,10 +1,8 @@
-# dup2.m4 serial 1
+# dup2.m4 serial 2
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_DUP2],
 [
@@ -18,4 +16,3 @@ AC_DEFUN([gl_FUNC_DUP2],
 AC_DEFUN([gl_PREREQ_DUP2], [
  AC_CHECK_HEADERS_ONCE(fcntl.h unistd.h)
 ])
-
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,4 +1,11 @@
-#serial 10
+#serial 11
+
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 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_ERROR],
 [
--- a/m4/euidaccess.m4
+++ b/m4/euidaccess.m4
@@ -1,10 +1,8 @@
-# euidaccess.m4 serial 4
+# euidaccess.m4 serial 5
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_NONREENTRANT_EUIDACCESS],
 [
@@ -48,4 +46,3 @@ AC_DEFUN([gl_PREREQ_EUIDACCESS], [
    AC_CHECK_FUNCS(eaccess)
  LIBS=$gl_saved_libs
 ])
-
--- a/m4/exclude.m4
+++ b/m4/exclude.m4
@@ -1,10 +1,8 @@
-# exclude.m4 serial 3
+# exclude.m4 serial 4
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_EXCLUDE],
 [
--- a/m4/exitfail.m4
+++ b/m4/exitfail.m4
@@ -1,10 +1,8 @@
-# exitfail.m4 serial 3
+# exitfail.m4 serial 4
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_EXITFAIL],
 [
--- a/m4/extensions.m4
+++ b/m4/extensions.m4
@@ -1,12 +1,9 @@
 # Enable extensions on systems that normally disable them.

 # Copyright (C) 2003 Free Software Foundation, Inc.
-
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
+# 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.

 # gl_USE_SYSTEM_EXTENSIONS
 # ------------------------
--- a/m4/fcntl-safer.m4
+++ b/m4/fcntl-safer.m4
@@ -1,20 +1,9 @@
-# fcntl-safer.m4 serial 2
+# fcntl-safer.m4 serial 3

 # Copyright (C) 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 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.

 # Written by Paul Eggert.

--- a/m4/file-type.m4
+++ b/m4/file-type.m4
@@ -1,10 +1,8 @@
-# file-type.m4 serial 1
+# file-type.m4 serial 2
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_FILE_TYPE],
 [
--- a/m4/fileblocks.m4
+++ b/m4/fileblocks.m4
@@ -1,10 +1,8 @@
-# fileblocks.m4 serial 1
+# fileblocks.m4 serial 2
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_FILEBLOCKS],
 [
--- a/m4/filemode.m4
+++ b/m4/filemode.m4
@@ -1,10 +1,8 @@
-# filemode.m4 serial 1
+# filemode.m4 serial 2
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_FILEMODE],
 [
--- a/m4/fnmatch.m4
+++ b/m4/fnmatch.m4
@@ -4,21 +4,9 @@
 # This file should be simplified after Autoconf 2.57 is required.

 # Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# 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_FUNC_FNMATCH_IF(STANDARD = GNU | POSIX, CACHE_VAR, IF-TRUE, IF-FALSE)
 # -------------------------------------------------------------------------
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -1,4 +1,9 @@
-#serial 4
+#serial 5
+
+# Copyright (C) 2000, 2001, 2004 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
 dnl Using code from emacs, based on suggestions from Paul Eggert
--- a/m4/free.m4
+++ b/m4/free.m4
@@ -1,12 +1,9 @@
 # Check whether free (NULL) is supposed to work.

 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
+# 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.

 # Written by Paul Eggert.

--- a/m4/fstypename.m4
+++ b/m4/fstypename.m4
@@ -1,4 +1,4 @@
-#serial 4
+#serial 5

 dnl From Jim Meyering.
 dnl
@@ -6,6 +6,11 @@ dnl See if struct statfs has the f_fstypename member.
 dnl If so, define HAVE_F_FSTYPENAME_IN_STATFS.
 dnl

+# Copyright (C) 1998, 1999, 2001, 2004 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_CACHE_CHECK([for f_fstypename in struct statfs],
--- a/m4/fsusage.m4
+++ b/m4/fsusage.m4
@@ -1,22 +1,12 @@
-# fsusage.m4 serial 13
+# fsusage.m4 serial 14
 # Obtaining file system usage information.

 # Copyright (C) 1997, 1998, 2000, 2001, 2003, 2004 Free Software
 # Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# 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.

 # Written by Jim Meyering.

--- a/m4/ftruncate.m4
+++ b/m4/ftruncate.m4
@@ -1,7 +1,12 @@
-#serial 6
+#serial 7

 # See if we need to emulate a missing ftruncate function using fcntl or chsize.

+# Copyright (C) 2000, 2001, 2003, 2004 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_REPLACE_FUNCS(ftruncate)
--- a/m4/getcwd-path-max.m4
+++ b/m4/getcwd-path-max.m4
@@ -1,4 +1,4 @@
-#serial 6
+#serial 7
 # Check for several getcwd bugs with long paths.
 # If so, arrange to compile the wrapper function.

@@ -7,20 +7,9 @@
 # been fixed between 2.4.21-pre3 and 2.4.21-pre4.  */

 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 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

--- a/m4/getcwd.m4
+++ b/m4/getcwd.m4
@@ -1,20 +1,9 @@
 # getcwd.m4 - check for working getcwd that is compatible with glibc

 # Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 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.

 # Written by Paul Eggert.

--- a/m4/getdate.m4
+++ b/m4/getdate.m4
@@ -1,10 +1,8 @@
-# getdate.m4 serial 5
+# getdate.m4 serial 6
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_GETDATE],
 [
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -1,8 +1,15 @@
-#serial 9
+#serial 10

 dnl From Jim Meyering.
 dnl A wrapper around AC_FUNC_GETGROUPS.

+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004 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_GETGROUPS],
 [
  AC_REQUIRE([AC_FUNC_GETGROUPS])
--- a/m4/gethostname.m4
+++ b/m4/gethostname.m4
@@ -1,10 +1,8 @@
-# gethostname.m4 serial 1
+# gethostname.m4 serial 2
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_GETHOSTNAME],
 [
@@ -18,4 +16,3 @@ AC_DEFUN([gl_FUNC_GETHOSTNAME],
 AC_DEFUN([gl_PREREQ_GETHOSTNAME], [
  AC_CHECK_FUNCS(uname)
 ])
-
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -1,13 +1,11 @@
-# getline.m4 serial 10
+# getline.m4 serial 11

 dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software
 dnl Foundation, Inc.
-
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl
+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.52)

--- a/m4/getndelim2.m4
+++ b/m4/getndelim2.m4
@@ -1,10 +1,8 @@
-# getndelim2.m4 serial 3
+# getndelim2.m4 serial 4
 dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_GETNDELIM2],
 [
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -1,10 +1,8 @@
-# getopt.m4 serial 6
+# getopt.m4 serial 7
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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 getopt module assume you want GNU getopt, with getopt_long etc,
 # rather than vanilla POSIX getopt.  This means your your code should
--- a/m4/getpagesize.m4
+++ b/m4/getpagesize.m4
@@ -1,10 +1,8 @@
-# getpagesize.m4 serial 2
+# getpagesize.m4 serial 3
 dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_GETPAGESIZE],
 [
--- a/m4/getpass.m4
+++ b/m4/getpass.m4
@@ -1,10 +1,8 @@
-# getpass.m4 serial 4
+# getpass.m4 serial 5
 dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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.

 # Provide a getpass() function if the system doesn't have it.
 AC_DEFUN([gl_FUNC_GETPASS],
--- a/m4/gettime.m4
+++ b/m4/gettime.m4
@@ -1,10 +1,8 @@
-# gettime.m4 serial 2
+# gettime.m4 serial 3
 dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_GETTIME],
 [
--- a/m4/gettimeofday.m4
+++ b/m4/gettimeofday.m4
@@ -1,10 +1,15 @@
-#serial 5
+#serial 6
+
+# Copyright (C) 2001, 2002, 2003 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.
 dnl
 dnl See if gettimeofday clobbers the static buffer that localtime uses
-dnl for it's return value.  The gettimeofday function from Mac OS X 10.0.4,
-dnl i.e. Darwin 1.3.7 has this problem.
+dnl for its return value.  The gettimeofday function from Mac OS X 10.0.4
+dnl (i.e., Darwin 1.3.7) has this problem.
 dnl
 dnl If it does, then arrange to use gettimeofday and localtime only via
 dnl the wrapper functions that work around the problem.
--- a/m4/getugroups.m4
+++ b/m4/getugroups.m4
@@ -1,10 +1,8 @@
-# getugroups.m4 serial 2
+# getugroups.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_GETUGROUPS],
 [
--- a/m4/getusershell.m4
+++ b/m4/getusershell.m4
@@ -1,10 +1,8 @@
-# getusershell.m4 serial 2
+# getusershell.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_GETUSERSHELL],
 [
--- a/m4/group-member.m4
+++ b/m4/group-member.m4
@@ -1,4 +1,9 @@
-#serial 6
+#serial 7
+
+# Copyright (C) 1999, 2000, 2001, 2003, 2004 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 Written by Jim Meyering

--- a/m4/hard-locale.m4
+++ b/m4/hard-locale.m4
@@ -1,10 +1,8 @@
-# hard-locale.m4 serial 4
+# hard-locale.m4 serial 5
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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 No prerequisites of lib/hard-locale.c.
 AC_DEFUN([gl_HARD_LOCALE], [:])
--- a/m4/hash.m4
+++ b/m4/hash.m4
@@ -1,10 +1,8 @@
-# hash.m4 serial 3
+# hash.m4 serial 4
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_HASH],
 [
--- a/m4/host-os.m4
+++ b/m4/host-os.m4
@@ -1,20 +1,9 @@
-#serial 4
+#serial 5

 # Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+# 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.

 # Written by Paul Eggert.

--- a/m4/human.m4
+++ b/m4/human.m4
@@ -1,10 +1,8 @@
-# human.m4 serial 6
+# human.m4 serial 7
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_HUMAN],
 [
--- a/m4/idcache.m4
+++ b/m4/idcache.m4
@@ -1,10 +1,8 @@
-# idcache.m4 serial 2
+# idcache.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_IDCACHE],
 [
--- a/m4/inttostr.m4
+++ b/m4/inttostr.m4
@@ -1,10 +1,8 @@
-# inttostr.m4 serial 2
+# inttostr.m4 serial 3
 dnl Copyright (C) 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_INTTOSTR],
 [
--- a/m4/jm-winsz1.m4
+++ b/m4/jm-winsz1.m4
@@ -1,4 +1,10 @@
-#serial 7
+#serial 8
+
+# Copyright (C) 1996, 1999, 2001, 2002, 2004 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 and Paul Eggert.
 AC_DEFUN([gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H],
 [AC_REQUIRE([AC_SYS_POSIX_TERMIOS])
--- a/m4/jm-winsz2.m4
+++ b/m4/jm-winsz2.m4
@@ -1,4 +1,9 @@
-#serial 5
+#serial 6
+
+# Copyright (C) 1996, 1999, 2001, 2004 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_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL],
 [AC_REQUIRE([gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H])
--- a/m4/link-follow.m4
+++ b/m4/link-follow.m4
@@ -1,7 +1,12 @@
-#serial 4
+#serial 5
 dnl Run a program to determine whether whether link(2) follows symlinks.
 dnl Set LINK_FOLLOWS_SYMLINKS accordingly.

+# Copyright (C) 1999, 2000, 2001, 2004 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_AC_FUNC_LINK_FOLLOWS_SYMLINK],
 [dnl
  AC_CACHE_CHECK(
--- a/m4/long-options.m4
+++ b/m4/long-options.m4
@@ -1,10 +1,8 @@
-# long-options.m4 serial 2
+# long-options.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_LONG_OPTIONS],
 [
--- a/m4/ls-mntd-fs.m4
+++ b/m4/ls-mntd-fs.m4
@@ -1,22 +1,12 @@
-#serial 19
+#serial 20
 # How to list mounted file systems.

 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
 # Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# 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.
 dnl
--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -1,4 +1,11 @@
-#serial 11
+#serial 12
+
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004 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.
 dnl Determine whether lstat has the bug that it succeeds when given the
--- a/m4/makepath.m4
+++ b/m4/makepath.m4
@@ -1,10 +1,8 @@
-# makepath.m4 serial 3
+# makepath.m4 serial 4
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_MAKEPATH],
 [
--- a/m4/md5.m4
+++ b/m4/md5.m4
@@ -1,10 +1,8 @@
-# md5.m4 serial 5
+# md5.m4 serial 6
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_MD5],
 [
--- a/m4/memchr.m4
+++ b/m4/memchr.m4
@@ -1,10 +1,8 @@
-# memchr.m4 serial 3
+# memchr.m4 serial 4
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_MEMCHR],
 [
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -1,10 +1,8 @@
-# memcmp.m4 serial 10
+# memcmp.m4 serial 11
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_MEMCMP],
 [
--- a/m4/memcoll.m4
+++ b/m4/memcoll.m4
@@ -1,10 +1,8 @@
-# memcoll.m4 serial 3
+# memcoll.m4 serial 4
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_MEMCOLL],
 [
--- a/m4/memcpy.m4
+++ b/m4/memcpy.m4
@@ -1,10 +1,8 @@
-# memcpy.m4 serial 1
+# memcpy.m4 serial 2
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_MEMCPY],
 [
--- a/m4/memmove.m4
+++ b/m4/memmove.m4
@@ -1,10 +1,8 @@
-# memmove.m4 serial 1
+# memmove.m4 serial 2
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_MEMMOVE],
 [
--- a/m4/memrchr.m4
+++ b/m4/memrchr.m4
@@ -1,10 +1,8 @@
-# memrchr.m4 serial 2
+# memrchr.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_MEMRCHR],
 [
--- a/m4/memset.m4
+++ b/m4/memset.m4
@@ -1,10 +1,8 @@
-# memset.m4 serial 1
+# memset.m4 serial 2
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_MEMSET],
 [
--- a/m4/mkdir-slash.m4
+++ b/m4/mkdir-slash.m4
@@ -1,4 +1,9 @@
-#serial 3
+#serial 4
+
+# Copyright (C) 2001, 2003, 2004 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.

 # On some systems, mkdir ("foo/", 0700) fails because of the trailing slash.
 # On such systems, arrange to use a wrapper function that removes any
--- a/m4/mkstemp.m4
+++ b/m4/mkstemp.m4
@@ -1,4 +1,9 @@
-#serial 8
+#serial 9
+
+# Copyright (C) 2001, 2003, 2004, 2005 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.

 # 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.
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -1,10 +1,8 @@
-# mktime.m4 serial 4
+# mktime.m4 serial 5
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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.

--- a/m4/modechange.m4
+++ b/m4/modechange.m4
@@ -1,10 +1,8 @@
-# modechange.m4 serial 2
+# modechange.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_MODECHANGE],
 [
--- a/m4/mountlist.m4
+++ b/m4/mountlist.m4
@@ -1,10 +1,8 @@
-# mountlist.m4 serial 4
+# mountlist.m4 serial 5
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_MOUNTLIST],
 [
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,10 +1,15 @@
-#serial 10
+#serial 11

 dnl From Jim Meyering.
 dnl Check for the nanosleep function.
 dnl If not found, use the supplied replacement.
 dnl

+# Copyright (C) 1999, 2000, 2001, 2003, 2004 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],
 [
 nanosleep_save_libs=$LIBS
--- a/m4/obstack.m4
+++ b/m4/obstack.m4
@@ -1,10 +1,8 @@
-# obstack.m4 serial 3
+# obstack.m4 serial 4
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_OBSTACK],
 [
--- a/m4/path-concat.m4
+++ b/m4/path-concat.m4
@@ -1,10 +1,8 @@
-# path-concat.m4 serial 4
+# path-concat.m4 serial 5
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_PATH_CONCAT],
 [
--- a/m4/pathmax.m4
+++ b/m4/pathmax.m4
@@ -1,10 +1,8 @@
-# pathmax.m4 serial 2
+# pathmax.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_PATHMAX],
 [
--- a/m4/perl.m4
+++ b/m4/perl.m4
@@ -1,9 +1,16 @@
-#serial 6
+#serial 7

 dnl From Jim Meyering.
 dnl Find a new-enough version of Perl.
 dnl

+# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004 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.003
--- a/m4/physmem.m4
+++ b/m4/physmem.m4
@@ -1,10 +1,8 @@
-# physmem.m4 serial 2
+# physmem.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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 the external symbol, _system_configuration,
 # a struct with member `physmem'.
--- a/m4/posixtm.m4
+++ b/m4/posixtm.m4
@@ -1,10 +1,8 @@
-# posixtm.m4 serial 2
+# posixtm.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_POSIXTM],
 [
--- a/m4/posixver.m4
+++ b/m4/posixver.m4
@@ -1,10 +1,8 @@
-# posixver.m4 serial 4
+# posixver.m4 serial 5
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_POSIXVER],
 [
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -1,10 +1,8 @@
-# putenv.m4 serial 8
+# putenv.m4 serial 9
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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/m4/quote.m4
+++ b/m4/quote.m4
@@ -1,10 +1,8 @@
-# quote.m4 serial 2
+# quote.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_QUOTE],
 [
--- a/m4/quotearg.m4
+++ b/m4/quotearg.m4
@@ -1,10 +1,8 @@
-# quotearg.m4 serial 2
+# quotearg.m4 serial 3
 dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_QUOTEARG],
 [
--- a/m4/readdir.m4
+++ b/m4/readdir.m4
@@ -1,4 +1,11 @@
-#serial 7
+#serial 8
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003 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 SunOS's readdir is broken in such a way that rm.c has to add extra code
 dnl to test whether a NULL return value really means there are no more files
--- a/m4/readtokens.m4
+++ b/m4/readtokens.m4
@@ -1,10 +1,8 @@
-# readtokens.m4 serial 2
+# readtokens.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_READTOKENS],
 [
--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,10 +1,8 @@
-# readutmp.m4 serial 5
+# readutmp.m4 serial 6
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_READUTMP],
 [
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,4 +1,11 @@
-#serial 21
+#serial 22
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 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 Initially derived from code in GNU grep.
 dnl Mostly written by Jim Meyering.
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -1,4 +1,9 @@
-#serial 6
+#serial 7
+
+# Copyright (C) 2001, 2003 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 Volker Borchert.
 dnl Determine whether rename works for source paths with a trailing slash.
--- a/m4/restrict.m4
+++ b/m4/restrict.m4
@@ -1,10 +1,8 @@
-#serial 1002
+#serial 1003
 dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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 macro can be removed once we can rely on Autoconf 2.57a or later,
 # since we can then use its AC_C_RESTRICT.
--- a/m4/rmdir-errno.m4
+++ b/m4/rmdir-errno.m4
@@ -1,4 +1,9 @@
-#serial 3
+#serial 4
+
+# Copyright (C) 2000, 2001, 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.

 # When rmdir fails because the specified directory is not empty, it sets
 # errno to some value, usually ENOTEMPTY.  However, on some AIX systems,
--- a/m4/rmdir.m4
+++ b/m4/rmdir.m4
@@ -1,10 +1,8 @@
-# rmdir.m4 serial 1
+# rmdir.m4 serial 2
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_RMDIR],
 [
@@ -19,4 +17,3 @@ AC_DEFUN([gl_PREREQ_RMDIR], [
  AC_REQUIRE([AC_HEADER_STAT])
  :
 ])
-
--- a/m4/rpmatch.m4
+++ b/m4/rpmatch.m4
@@ -1,10 +1,8 @@
-# rpmatch.m4 serial 4
+# rpmatch.m4 serial 5
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_RPMATCH],
 [
--- a/m4/same.m4
+++ b/m4/same.m4
@@ -1,10 +1,8 @@
-# same.m4 serial 2
+# same.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_SAME],
 [
--- a/m4/savedir.m4
+++ b/m4/savedir.m4
@@ -1,10 +1,8 @@
-# savedir.m4 serial 2
+# savedir.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_SAVEDIR],
 [
--- a/m4/settime.m4
+++ b/m4/settime.m4
@@ -1,10 +1,8 @@
-# settime.m4 serial 2
+# settime.m4 serial 3
 dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+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_SETTIME],
 [
--- a/Show More
+++ b/Show More