summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--m4/ChangeLog39
-rw-r--r--m4/acl.m419
-rw-r--r--m4/afs.m47
-rw-r--r--m4/alloca.m410
-rw-r--r--m4/argp.m410
-rw-r--r--m4/assert.m48
-rw-r--r--m4/atexit.m410
-rw-r--r--m4/backupfile.m410
-rw-r--r--m4/base64.m410
-rw-r--r--m4/bison.m47
-rw-r--r--m4/c-bs-a.m415
-rw-r--r--m4/c-stack.m418
-rw-r--r--m4/c-strtod.m419
-rw-r--r--m4/calloc.m419
-rw-r--r--m4/canon-host.m410
-rw-r--r--m4/canonicalize.m419
-rw-r--r--m4/clock_time.m410
-rw-r--r--m4/cloexec.m410
-rw-r--r--m4/closeout.m410
-rw-r--r--m4/d-ino.m49
-rw-r--r--m4/d-type.m49
-rw-r--r--m4/dirfd.m48
-rw-r--r--m4/dirname.m410
-rw-r--r--m4/dos.m420
-rw-r--r--m4/dup2.m411
-rw-r--r--m4/error.m49
-rw-r--r--m4/euidaccess.m411
-rw-r--r--m4/exclude.m410
-rw-r--r--m4/exitfail.m410
-rw-r--r--m4/extensions.m49
-rw-r--r--m4/fcntl-safer.m419
-rw-r--r--m4/file-type.m410
-rw-r--r--m4/fileblocks.m410
-rw-r--r--m4/filemode.m410
-rw-r--r--m4/fnmatch.m418
-rw-r--r--m4/fpending.m47
-rw-r--r--m4/free.m49
-rw-r--r--m4/fstypename.m47
-rw-r--r--m4/fsusage.m420
-rw-r--r--m4/ftruncate.m47
-rw-r--r--m4/getaddrinfo.m410
-rw-r--r--m4/getcwd-path-max.m419
-rw-r--r--m4/getcwd.m417
-rw-r--r--m4/getdate.m410
-rw-r--r--m4/getdomainname.m410
-rw-r--r--m4/getgroups.m49
-rw-r--r--m4/gethostname.m411
-rw-r--r--m4/getline.m412
-rw-r--r--m4/getndelim2.m410
-rw-r--r--m4/getnline.m410
-rw-r--r--m4/getopt.m410
-rw-r--r--m4/getpagesize.m410
-rw-r--r--m4/getpass.m410
-rw-r--r--m4/getsubopt.m410
-rw-r--r--m4/gettime.m410
-rw-r--r--m4/gettimeofday.m411
-rw-r--r--m4/getugroups.m410
-rw-r--r--m4/getusershell.m410
-rw-r--r--m4/group-member.m47
-rw-r--r--m4/hard-locale.m410
-rw-r--r--m4/hash.m410
-rw-r--r--m4/host-os.m419
-rw-r--r--m4/human.m410
-rw-r--r--m4/idcache.m410
-rw-r--r--m4/inttostr.m410
-rw-r--r--m4/isdir.m410
-rw-r--r--m4/jm-winsz1.m48
-rw-r--r--m4/jm-winsz2.m47
-rw-r--r--m4/link-follow.m47
-rw-r--r--m4/long-options.m410
-rw-r--r--m4/ls-mntd-fs.m420
-rw-r--r--m4/lstat.m49
-rw-r--r--m4/makepath.m410
-rw-r--r--m4/mathl.m410
-rw-r--r--m4/md5.m410
-rw-r--r--m4/memcasecmp.m410
-rw-r--r--m4/memchr.m410
-rw-r--r--m4/memcmp.m410
-rw-r--r--m4/memcoll.m410
-rw-r--r--m4/memcpy.m410
-rw-r--r--m4/memmem.m410
-rw-r--r--m4/memmove.m410
-rw-r--r--m4/memrchr.m410
-rw-r--r--m4/memset.m410
-rw-r--r--m4/mkdir-slash.m47
-rw-r--r--m4/mkstemp.m47
-rw-r--r--m4/mktime.m410
-rw-r--r--m4/modechange.m410
-rw-r--r--m4/mountlist.m410
-rw-r--r--m4/nanosleep.m47
-rw-r--r--m4/obstack.m410
-rw-r--r--m4/path-concat.m410
-rw-r--r--m4/pathmax.m410
-rw-r--r--m4/perl.m49
-rw-r--r--m4/physmem.m410
-rw-r--r--m4/poll.m410
-rw-r--r--m4/posixtm.m410
-rw-r--r--m4/posixver.m410
-rw-r--r--m4/putenv.m410
-rw-r--r--m4/quote.m410
-rw-r--r--m4/quotearg.m410
-rw-r--r--m4/readdir.m49
-rw-r--r--m4/readtokens.m410
-rw-r--r--m4/readutmp.m410
-rw-r--r--m4/regex.m49
-rw-r--r--m4/rename.m47
-rw-r--r--m4/restrict.m410
-rw-r--r--m4/rmdir-errno.m47
-rw-r--r--m4/rmdir.m411
-rw-r--r--m4/rpmatch.m410
-rw-r--r--m4/same.m410
-rw-r--r--m4/savedir.m410
-rw-r--r--m4/settime.m410
-rw-r--r--m4/sha1.m410
-rw-r--r--m4/sig2str.m411
-rw-r--r--m4/snprintf.m410
-rw-r--r--m4/sockpfaf.m410
-rw-r--r--m4/st_dm_mode.m47
-rw-r--r--m4/st_mtim.m47
-rw-r--r--m4/stat.m49
-rw-r--r--m4/stdint.m410
-rw-r--r--m4/stdio-safer.m410
-rw-r--r--m4/strchrnul.m410
-rw-r--r--m4/strdup.m410
-rw-r--r--m4/strerror.m410
-rw-r--r--m4/strerror_r.m422
-rw-r--r--m4/strftime.m420
-rw-r--r--m4/strndup.m411
-rw-r--r--m4/strnlen.m410
-rw-r--r--m4/strsep.m410
-rw-r--r--m4/strtod.m410
-rw-r--r--m4/strtoimax.m410
-rw-r--r--m4/strtok_r.m410
-rw-r--r--m4/strtol.m410
-rw-r--r--m4/strtoll.m410
-rw-r--r--m4/strtoul.m410
-rw-r--r--m4/strtoull.m410
-rw-r--r--m4/strtoumax.m410
-rw-r--r--m4/strverscmp.m411
-rw-r--r--m4/sysexits.m410
-rw-r--r--m4/time_r.m49
-rw-r--r--m4/timegm.m410
-rw-r--r--m4/timespec.m47
-rw-r--r--m4/tm_gmtoff.m410
-rw-r--r--m4/tzset.m48
-rw-r--r--m4/uint32_t.m419
-rw-r--r--m4/uintptr_t.m419
-rw-r--r--m4/unistd-safer.m410
-rw-r--r--m4/unlink-busy.m47
-rw-r--r--m4/unlocked-io.m420
-rw-r--r--m4/uptime.m47
-rw-r--r--m4/userspec.m410
-rw-r--r--m4/utimbuf.m49
-rw-r--r--m4/utime.m47
-rw-r--r--m4/utimecmp.m48
-rw-r--r--m4/utimens.m48
-rw-r--r--m4/utimes-null.m47
-rw-r--r--m4/vsnprintf.m410
-rw-r--r--m4/xalloc.m412
-rw-r--r--m4/xgetcwd.m410
-rw-r--r--m4/xreadlink.m410
-rw-r--r--m4/xstrndup.m410
-rw-r--r--m4/xstrtod.m410
-rw-r--r--m4/xstrtoimax.m47
-rw-r--r--m4/xstrtol.m410
-rw-r--r--m4/xstrtoumax.m47
-rw-r--r--m4/yesno.m410
167 files changed, 806 insertions, 985 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog
index f1ee0caf5e..d608deae33 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,42 @@
+2005-01-23 Paul Eggert <eggert@cs.ucla.edu>
+
+ * acl.m4, afs.m4, alloca.m4, argp.m4, assert.m4, atexit.m4,
+ backupfile.m4, base64.m4, bison.m4, c-bs-a.m4, c-stack.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, getaddrinfo.m4,
+ getcwd-path-max.m4, getcwd.m4, getdate.m4, getdomainname.m4,
+ getgroups.m4, gethostname.m4, getline.m4, getndelim2.m4,
+ getnline.m4, getopt.m4, getpagesize.m4, getpass.m4, getsubopt.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, isdir.m4, jm-winsz1.m4, jm-winsz2.m4,
+ link-follow.m4, long-options.m4, ls-mntd-fs.m4, lstat.m4,
+ makepath.m4, mathl.m4, md5.m4, memcasecmp.m4, memchr.m4,
+ memcmp.m4, memcoll.m4, memcpy.m4, memmem.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, poll.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, snprintf.m4,
+ sockpfaf.m4, st_dm_mode.m4, st_mtim.m4, stat.m4, stdint.m4,
+ stdio-safer.m4, strchrnul.m4, strdup.m4, strerror.m4,
+ strerror_r.m4, strftime.m4, strndup.m4, strnlen.m4, strsep.m4,
+ strtod.m4, strtoimax.m4, strtok_r.m4, strtol.m4, strtoll.m4,
+ strtoul.m4, strtoull.m4, strtoumax.m4, strverscmp.m4, sysexits.m4,
+ time_r.m4, timegm.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, vsnprintf.m4, xalloc.m4,
+ xgetcwd.m4, xreadlink.m4, xstrndup.m4, xstrtod.m4, xstrtoimax.m4,
+ xstrtol.m4, xstrtoumax.m4, yesno.m4:
+ Use an all-permissive copyright notice, recommended by RMS.
+
2005-01-20 Paul Eggert <eggert@cs.ucla.edu>
* save-cwd.m4 (gl_SAVE_CWD): Remove check for fcntl; we now assume it.
diff --git a/m4/acl.m4 b/m4/acl.m4
index 563f18cea4..7f6e4e575e 100644
--- 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.
diff --git a/m4/afs.m4 b/m4/afs.m4
index 05e4a5b29a..6f7a56cc76 100644
--- 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],
[
diff --git a/m4/alloca.m4 b/m4/alloca.m4
index 6fcb205e94..a9e3f452c9 100644
--- 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],
[
diff --git a/m4/argp.m4 b/m4/argp.m4
index 473902fa3e..98fb40f62f 100644
--- a/m4/argp.m4
+++ b/m4/argp.m4
@@ -1,10 +1,8 @@
-# argp.m4 serial 3
+# argp.m4 serial 4
dnl Copyright (C) 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_ARGP],
[
diff --git a/m4/assert.m4 b/m4/assert.m4
index 97315eea37..bfdc00f239 100644
--- 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],
diff --git a/m4/atexit.m4 b/m4/atexit.m4
index dddc40e68b..348912f9fa 100644
--- 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],
[
diff --git a/m4/backupfile.m4 b/m4/backupfile.m4
index 0793f1f004..528b7a088e 100644
--- 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],
[
diff --git a/m4/base64.m4 b/m4/base64.m4
index d41abc6b66..49bd32592c 100644
--- a/m4/base64.m4
+++ b/m4/base64.m4
@@ -1,10 +1,8 @@
-# base64.m4 serial 1
+# base64.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_FUNC_BASE64],
[
diff --git a/m4/bison.m4 b/m4/bison.m4
index c4854b273a..273b641ed3 100644
--- 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],
[
diff --git a/m4/c-bs-a.m4 b/m4/c-bs-a.m4
index 1c7eb1c4e7..a050d2d41e 100644
--- a/m4/c-bs-a.m4
+++ b/m4/c-bs-a.m4
@@ -1,12 +1,11 @@
-# c-bs-a.m4 serial 4 (fileutils-4.1.3)
-dnl Copyright (C) 2000-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.
+# c-bs-a.m4 serial 5
-dnl From Paul Eggert.
+# Copyright (C) 2000, 2001, 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.
+
+# From Paul Eggert.
AC_DEFUN([AC_C_BACKSLASH_A],
[
diff --git a/m4/c-stack.m4 b/m4/c-stack.m4
index 9511e8f965..0f89fd348c 100644
--- a/m4/c-stack.m4
+++ b/m4/c-stack.m4
@@ -1,21 +1,9 @@
# Check prerequisites for compiling lib/c-stack.c.
# Copyright (C) 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.
# Written by Paul Eggert.
diff --git a/m4/c-strtod.m4 b/m4/c-strtod.m4
index b343fddae9..87ec19159c 100644
--- 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.
diff --git a/m4/calloc.m4 b/m4/calloc.m4
index f244df7b22..d4d92f3c8f 100644
--- 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.
diff --git a/m4/canon-host.m4 b/m4/canon-host.m4
index bd7569a267..e59f8759bc 100644
--- 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],
[
diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
index 0731f4dc57..182bda71fd 100644
--- 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.
diff --git a/m4/clock_time.m4 b/m4/clock_time.m4
index f3266a76ae..a5bc42775a 100644
--- 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],
diff --git a/m4/cloexec.m4 b/m4/cloexec.m4
index 06b36d5e2d..ca0d6bcc15 100644
--- 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],
[
diff --git a/m4/closeout.m4 b/m4/closeout.m4
index 817982798d..cb51eb07c0 100644
--- 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],
[
diff --git a/m4/d-ino.m4 b/m4/d-ino.m4
index 56ce35e2c3..4d2c4dbfe4 100644
--- 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],
diff --git a/m4/d-type.m4 b/m4/d-type.m4
index 9c62198d51..6f3125c7e0 100644
--- 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],
diff --git a/m4/dirfd.m4 b/m4/dirfd.m4
index f84d63fac3..5e51ed2bf7 100644
--- 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],
diff --git a/m4/dirname.m4 b/m4/dirname.m4
index b93ff608c4..8b14184dca 100644
--- 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],
[
diff --git a/m4/dos.m4 b/m4/dos.m4
index 90f52c3cf0..0713cf14e6 100644
--- 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.
diff --git a/m4/dup2.m4 b/m4/dup2.m4
index 7273669466..ba9147da75 100644
--- 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)
])
-
diff --git a/m4/error.m4 b/m4/error.m4
index da8fb513c6..7c7746e2cc 100644
--- 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],
[
diff --git a/m4/euidaccess.m4 b/m4/euidaccess.m4
index c14fb8f284..c113b4d381 100644
--- 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
])
-
diff --git a/m4/exclude.m4 b/m4/exclude.m4
index 6ea17e3875..4d6e1b0abc 100644
--- 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],
[
diff --git a/m4/exitfail.m4 b/m4/exitfail.m4
index fa5b14931f..f25c64df8b 100644
--- 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],
[
diff --git a/m4/extensions.m4 b/m4/extensions.m4
index 58bc0beb6d..6f34a8d35c 100644
--- 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
# ------------------------
diff --git a/m4/fcntl-safer.m4 b/m4/fcntl-safer.m4
index 16ecf81651..f147bfefab 100644
--- 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.
diff --git a/m4/file-type.m4 b/m4/file-type.m4
index 34a94408ce..facbb4fd40 100644
--- 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],
[
diff --git a/m4/fileblocks.m4 b/m4/fileblocks.m4
index 07e2b70eb3..2b7bbd9f36 100644
--- 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],
[
diff --git a/m4/filemode.m4 b/m4/filemode.m4
index cc08698aa4..9eee98b7ce 100644
--- 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],
[
diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
index 92a8f2b58b..bca15add15 100644
--- 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)
# -------------------------------------------------------------------------
diff --git a/m4/fpending.m4 b/m4/fpending.m4
index d086ac635e..25fc16728e 100644
--- 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
diff --git a/m4/free.m4 b/m4/free.m4
index 5e7546530b..99ebc9ae99 100644
--- 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.
diff --git a/m4/fstypename.m4 b/m4/fstypename.m4
index f909a0d3c8..7ff33e20a2 100644
--- 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],
diff --git a/m4/fsusage.m4 b/m4/fsusage.m4
index a6a87c532f..306d0efb39 100644
--- 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.
diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4
index b2ce6dd568..d25c17ef66 100644
--- 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)
diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4
index 10de9d67ed..664a12101e 100644
--- a/m4/getaddrinfo.m4
+++ b/m4/getaddrinfo.m4
@@ -1,10 +1,8 @@
-# getaddrinfo.m4 serial 1
+# getaddrinfo.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_GETADDRINFO],
[
diff --git a/m4/getcwd-path-max.m4 b/m4/getcwd-path-max.m4
index 5cc720b3b6..1c22234ac4 100644
--- 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
diff --git a/m4/getcwd.m4 b/m4/getcwd.m4
index fab8bfcf93..c2524916e3 100644
--- 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.
diff --git a/m4/getdate.m4 b/m4/getdate.m4
index a88f295563..978cf5022a 100644
--- 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],
[
diff --git a/m4/getdomainname.m4 b/m4/getdomainname.m4
index 744d646c94..88da554fc4 100644
--- a/m4/getdomainname.m4
+++ b/m4/getdomainname.m4
@@ -1,10 +1,8 @@
-# getdomainname.m4 serial 1
+# getdomainname.m4 serial 2
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_GETDOMAINNAME],
[
diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index e7bf2c1834..edc2bde9d9 100644
--- 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])
diff --git a/m4/gethostname.m4 b/m4/gethostname.m4
index f9da4b1976..1e9749d39e 100644
--- 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)
])
-
diff --git a/m4/getline.m4 b/m4/getline.m4
index 56960c9371..2b5aaabcd6 100644
--- 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)
diff --git a/m4/getndelim2.m4 b/m4/getndelim2.m4
index cd4ef4b671..404b36d4f9 100644
--- 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],
[
diff --git a/m4/getnline.m4 b/m4/getnline.m4
index 0ee18c83e5..cdfa0c28a4 100644
--- a/m4/getnline.m4
+++ b/m4/getnline.m4
@@ -1,10 +1,8 @@
-# getnline.m4 serial 2
+# getnline.m4 serial 3
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_GETNLINE],
[
diff --git a/m4/getopt.m4 b/m4/getopt.m4
index dcd333ba3a..4d8bd74ab9 100644
--- 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
diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4
index a2f818b62b..6076cefe44 100644
--- 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],
[
diff --git a/m4/getpass.m4 b/m4/getpass.m4
index 8d682242c9..d48534c573 100644
--- 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],
diff --git a/m4/getsubopt.m4 b/m4/getsubopt.m4
index 9b87e7c83a..4c479e0a5d 100644
--- a/m4/getsubopt.m4
+++ b/m4/getsubopt.m4
@@ -1,10 +1,8 @@
-# getsubopt.m4 serial 1
+# getsubopt.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_FUNC_GETSUBOPT],
[
diff --git a/m4/gettime.m4 b/m4/gettime.m4
index 37b9098e8b..84804ab06e 100644
--- 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],
[
diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
index 3875972d26..ae3d3069b4 100644
--- 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.
diff --git a/m4/getugroups.m4 b/m4/getugroups.m4
index b7b990a446..7d96bb70da 100644
--- 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],
[
diff --git a/m4/getusershell.m4 b/m4/getusershell.m4
index 00630b9569..736077d7e1 100644
--- 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],
[
diff --git a/m4/group-member.m4 b/m4/group-member.m4
index c9fd3436b8..dca7f9e806 100644
--- 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
diff --git a/m4/hard-locale.m4 b/m4/hard-locale.m4
index 6ce7cc1e53..8c97051f9a 100644
--- 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], [:])
diff --git a/m4/hash.m4 b/m4/hash.m4
index 9fe3211f91..c156ecb315 100644
--- 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],
[
diff --git a/m4/host-os.m4 b/m4/host-os.m4
index e8fe072149..2e32329ae1 100644
--- 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.
diff --git a/m4/human.m4 b/m4/human.m4
index e800d74071..a9c194e714 100644
--- 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],
[
diff --git a/m4/idcache.m4 b/m4/idcache.m4
index d20d392092..6fab7cffc0 100644
--- 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],
[
diff --git a/m4/inttostr.m4 b/m4/inttostr.m4
index 43ad5f663c..b1aabad469 100644
--- 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],
[
diff --git a/m4/isdir.m4 b/m4/isdir.m4
index a088210a4d..2624856df5 100644
--- a/m4/isdir.m4
+++ b/m4/isdir.m4
@@ -1,10 +1,8 @@
-# isdir.m4 serial 1
+# isdir.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_ISDIR],
[
diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4
index 5bfbdab517..ce5eca00e3 100644
--- 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])
diff --git a/m4/jm-winsz2.m4 b/m4/jm-winsz2.m4
index 20ceb0d10c..66c5040925 100644
--- 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])
diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
index 45f189ef1f..813369b008 100644
--- 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(
diff --git a/m4/long-options.m4 b/m4/long-options.m4
index 4741954297..58333cf4cc 100644
--- 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],
[
diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4
index 2eca0736e7..ed243861ca 100644
--- 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
diff --git a/m4/lstat.m4 b/m4/lstat.m4
index 0c6362c50f..f65f593780 100644
--- 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
diff --git a/m4/makepath.m4 b/m4/makepath.m4
index af8350a577..c6df126dfa 100644
--- 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],
[
diff --git a/m4/mathl.m4 b/m4/mathl.m4
index a7d0002407..c875203d41 100644
--- a/m4/mathl.m4
+++ b/m4/mathl.m4
@@ -1,10 +1,8 @@
-# mathl.m4 serial 1
+# mathl.m4 serial 2
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 the 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_LONG_DOUBLE_MATH], [
diff --git a/m4/md5.m4 b/m4/md5.m4
index ec45b5a21e..861e3ff0ea 100644
--- 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],
[
diff --git a/m4/memcasecmp.m4 b/m4/memcasecmp.m4
index 2726627a83..5b862645ff 100644
--- a/m4/memcasecmp.m4
+++ b/m4/memcasecmp.m4
@@ -1,10 +1,8 @@
-# memcasecmp.m4 serial 1
+# memcasecmp.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_MEMCASECMP],
[
diff --git a/m4/memchr.m4 b/m4/memchr.m4
index 0ae7ff11b5..91b8636eb8 100644
--- 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],
[
diff --git a/m4/memcmp.m4 b/m4/memcmp.m4
index 3e85fb8f6c..58faf0bd2a 100644
--- 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],
[
diff --git a/m4/memcoll.m4 b/m4/memcoll.m4
index 131841a403..79608eea4a 100644
--- 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],
[
diff --git a/m4/memcpy.m4 b/m4/memcpy.m4
index db94905fac..3edc62e466 100644
--- 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],
[
diff --git a/m4/memmem.m4 b/m4/memmem.m4
index 2e4a20bc3c..86072eaac1 100644
--- a/m4/memmem.m4
+++ b/m4/memmem.m4
@@ -1,10 +1,8 @@
-# memmem.m4 serial 1
+# memmem.m4 serial 2
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_MEMMEM],
[
diff --git a/m4/memmove.m4 b/m4/memmove.m4
index 6f9530aa9d..66054e4416 100644
--- 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],
[
diff --git a/m4/memrchr.m4 b/m4/memrchr.m4
index dfb0583acc..06a9b1ee7e 100644
--- 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],
[
diff --git a/m4/memset.m4 b/m4/memset.m4
index 138eada07a..14ac2678e3 100644
--- 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],
[
diff --git a/m4/mkdir-slash.m4 b/m4/mkdir-slash.m4
index 7507b5576a..c1e595bbd3 100644
--- 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
diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4
index 9204fbd1cf..8793866f93 100644
--- 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.
diff --git a/m4/mktime.m4 b/m4/mktime.m4
index 94ed67f706..25ca6dc46d 100644
--- 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.
diff --git a/m4/modechange.m4 b/m4/modechange.m4
index 80b03c967a..44def51e49 100644
--- 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],
[
diff --git a/m4/mountlist.m4 b/m4/mountlist.m4
index 8e79285c6a..d0cee86ffc 100644
--- 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],
[
diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index 0cf4094434..d3c466d4da 100644
--- 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
diff --git a/m4/obstack.m4 b/m4/obstack.m4
index a1e879b061..ea60f7fc8d 100644
--- 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],
[
diff --git a/m4/path-concat.m4 b/m4/path-concat.m4
index 49984aa41f..cef4266eda 100644
--- 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],
[
diff --git a/m4/pathmax.m4 b/m4/pathmax.m4
index 95ab044d84..9790e134fb 100644
--- 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],
[
diff --git a/m4/perl.m4 b/m4/perl.m4
index d9c89cde2b..96421b9a31 100644
--- 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
diff --git a/m4/physmem.m4 b/m4/physmem.m4
index 824db10fa8..abda0558a2 100644
--- 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'.
diff --git a/m4/poll.m4 b/m4/poll.m4
index 5bfc33c6f1..d56c9ffcb8 100644
--- a/m4/poll.m4
+++ b/m4/poll.m4
@@ -1,10 +1,8 @@
-# poll.m4 serial 2
+# poll.m4 serial 3
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 the 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_POLL],
[
diff --git a/m4/posixtm.m4 b/m4/posixtm.m4
index 0bf4aca173..625ea9b2bb 100644
--- 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],
[
diff --git a/m4/posixver.m4 b/m4/posixver.m4
index 1fb8772f17..3e0bc04def 100644
--- 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],
[
diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 0bb17f415a..90ec17064c 100644
--- 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
diff --git a/m4/quote.m4 b/m4/quote.m4
index 14ce1b6198..18beaff924 100644
--- 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],
[
diff --git a/m4/quotearg.m4 b/m4/quotearg.m4
index 877fcd9af1..6b8b031a8d 100644
--- 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],
[
diff --git a/m4/readdir.m4 b/m4/readdir.m4
index db645ecc5e..7783ef020d 100644
--- 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
diff --git a/m4/readtokens.m4 b/m4/readtokens.m4
index 9fdf2eb17c..7cacb47535 100644
--- 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],
[
diff --git a/m4/readutmp.m4 b/m4/readutmp.m4
index 2f7b53ca82..dd9ae9e600 100644
--- 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],
[
diff --git a/m4/regex.m4 b/m4/regex.m4
index 696fce1ee4..34435de66d 100644
--- 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.
diff --git a/m4/rename.m4 b/m4/rename.m4
index 43e90854b7..7d59160361 100644
--- 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.
diff --git a/m4/restrict.m4 b/m4/restrict.m4
index c8407782d5..1f3bbb92c4 100644
--- 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.
diff --git a/m4/rmdir-errno.m4 b/m4/rmdir-errno.m4
index cb21d80260..b96bddddef 100644
--- 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,
diff --git a/m4/rmdir.m4 b/m4/rmdir.m4
index a86ff782ed..91eff7fdbf 100644
--- 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])
:
])
-
diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4
index dd787ee167..4a471ac860 100644
--- 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],
[
diff --git a/m4/same.m4 b/m4/same.m4
index 51a2cd5c38..8a0870a390 100644
--- 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],
[
diff --git a/m4/savedir.m4 b/m4/savedir.m4
index 9b8afce67d..f9cfdcb513 100644
--- 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],
[
diff --git a/m4/settime.m4 b/m4/settime.m4
index 89c030cd0f..208b9d09b4 100644
--- 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],
[
diff --git a/m4/sha1.m4 b/m4/sha1.m4
index a3725db8f8..26306ff6c0 100644
--- a/m4/sha1.m4
+++ b/m4/sha1.m4
@@ -1,10 +1,8 @@
-# sha1.m4 serial 4
+# sha1.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_SHA1],
[
diff --git a/m4/sig2str.m4 b/m4/sig2str.m4
index deef9c56fd..73d89c8f24 100644
--- a/m4/sig2str.m4
+++ b/m4/sig2str.m4
@@ -1,10 +1,8 @@
-# sig2str.m4 serial 1
+# sig2str.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_SIG2STR],
[
@@ -18,4 +16,3 @@ AC_DEFUN([gl_FUNC_SIG2STR],
AC_DEFUN([gl_PREREQ_SIG2STR], [
:
])
-
diff --git a/m4/snprintf.m4 b/m4/snprintf.m4
index 01c44ad23b..432e037550 100644
--- a/m4/snprintf.m4
+++ b/m4/snprintf.m4
@@ -1,10 +1,8 @@
-# snprintf.m4 serial 1
+# snprintf.m4 serial 2
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_SNPRINTF],
[
diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4
index a0527f1df6..b224faec5e 100644
--- a/m4/sockpfaf.m4
+++ b/m4/sockpfaf.m4
@@ -1,10 +1,8 @@
-# sockpfaf.m4 serial 1
+# sockpfaf.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.
dnl Test for some common socket protocol families (PF_INET, PF_INET6, ...)
dnl and some common address families (AF_INET, AF_INET6, ...).
diff --git a/m4/st_dm_mode.m4 b/m4/st_dm_mode.m4
index ef5232efff..c1da15439c 100644
--- a/m4/st_dm_mode.m4
+++ b/m4/st_dm_mode.m4
@@ -1,4 +1,9 @@
-#serial 3
+#serial 4
+
+# Copyright (C) 1998, 1999, 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.
# Define HAVE_ST_DM_MODE if struct stat has an st_dm_mode member.
diff --git a/m4/st_mtim.m4 b/m4/st_mtim.m4
index 4d03c8e419..4e2df5e441 100644
--- a/m4/st_mtim.m4
+++ b/m4/st_mtim.m4
@@ -1,4 +1,9 @@
-#serial 6
+#serial 7
+
+# Copyright (C) 1998, 1999, 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 Paul Eggert.
diff --git a/m4/stat.m4 b/m4/stat.m4
index 01c682a497..d87064518b 100644
--- a/m4/stat.m4
+++ b/m4/stat.m4
@@ -1,4 +1,11 @@
-#serial 10
+#serial 11
+
+# 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 stat has the bug that it succeeds when given the
diff --git a/m4/stdint.m4 b/m4/stdint.m4
index 4471d71ecf..fe8ac6115a 100644
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -1,10 +1,8 @@
-# stdint.m4 serial 2
+# stdint.m4 serial 3
dnl Copyright (C) 2001-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.
dnl From Bruno Haible.
dnl Test whether <stdint.h> is supported or must be substituted.
diff --git a/m4/stdio-safer.m4 b/m4/stdio-safer.m4
index 716c3bcd1a..f5f54a7021 100644
--- a/m4/stdio-safer.m4
+++ b/m4/stdio-safer.m4
@@ -1,10 +1,8 @@
-# stdio-safer.m4 serial 1
+# stdio-safer.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_STDIO_SAFER],
[
diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4
index 51edfb3028..8492b9f174 100644
--- a/m4/strchrnul.m4
+++ b/m4/strchrnul.m4
@@ -1,10 +1,8 @@
-# strchrnul.m4 serial 2
+# strchrnul.m4 serial 3
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_FUNC_STRCHRNUL],
[
diff --git a/m4/strdup.m4 b/m4/strdup.m4
index 9964d15b10..76e621ba78 100644
--- a/m4/strdup.m4
+++ b/m4/strdup.m4
@@ -1,10 +1,8 @@
-# strdup.m4 serial 4
+# strdup.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_STRDUP],
[
diff --git a/m4/strerror.m4 b/m4/strerror.m4
index d9aca1bb01..32bc7ed395 100644
--- a/m4/strerror.m4
+++ b/m4/strerror.m4
@@ -1,10 +1,8 @@
-# strerror.m4 serial 1 (gettext-0.12)
+# strerror.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_STRERROR],
[
diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4
index bd28635281..28924b1752 100644
--- a/m4/strerror_r.m4
+++ b/m4/strerror_r.m4
@@ -1,22 +1,12 @@
-#serial 1003
+#serial 1004
+# This file is not needed if you can assume Autoconf 2.54 or later.
# Experimental replacement for the function in the latest CVS autoconf.
# Use with the error.c file in ../lib.
-# Copyright 2001 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) 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.
undefine([AC_FUNC_STRERROR_R])
diff --git a/m4/strftime.m4 b/m4/strftime.m4
index e28224d68d..36f20a3426 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,21 +1,11 @@
-#serial 23
+#serial 24
# Copyright (C) 1996, 1997, 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.
# Written by Jim Meyering and Paul Eggert.
diff --git a/m4/strndup.m4 b/m4/strndup.m4
index 80dfcc1d90..05204aad8f 100644
--- a/m4/strndup.m4
+++ b/m4/strndup.m4
@@ -1,10 +1,8 @@
-# strndup.m4 serial 2
+# strndup.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_STRNDUP],
[
@@ -21,4 +19,3 @@ AC_DEFUN([gl_FUNC_STRNDUP],
AC_DEFUN([gl_PREREQ_STRNDUP], [
AC_CHECK_DECLS(strnlen)
])
-
diff --git a/m4/strnlen.m4 b/m4/strnlen.m4
index 989ff49f75..e6af315cb6 100644
--- a/m4/strnlen.m4
+++ b/m4/strnlen.m4
@@ -1,10 +1,8 @@
-# strnlen.m4 serial 3
+# strnlen.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_FUNC_STRNLEN],
[
diff --git a/m4/strsep.m4 b/m4/strsep.m4
index cfcb06fb9e..40a087b3d2 100644
--- a/m4/strsep.m4
+++ b/m4/strsep.m4
@@ -1,10 +1,8 @@
-# strsep.m4 serial 2
+# strsep.m4 serial 3
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_STRSEP],
[
diff --git a/m4/strtod.m4 b/m4/strtod.m4
index fb742f7d58..eb4f9da5b6 100644
--- a/m4/strtod.m4
+++ b/m4/strtod.m4
@@ -1,10 +1,8 @@
-# strtod.m4 serial 3
+# strtod.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_FUNC_STRTOD],
[
diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4
index 84e57a8761..914e180bc3 100644
--- a/m4/strtoimax.m4
+++ b/m4/strtoimax.m4
@@ -1,10 +1,8 @@
-# strtoimax.m4 serial 4
+# strtoimax.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_STRTOIMAX],
[
diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4
index 390b7faf47..28515a651a 100644
--- a/m4/strtok_r.m4
+++ b/m4/strtok_r.m4
@@ -1,10 +1,8 @@
-# strtok_r.m4 serial 1
+# strtok_r.m4 serial 2
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_STRTOK_R],
[
diff --git a/m4/strtol.m4 b/m4/strtol.m4
index 7740eccdab..b9308ed53b 100644
--- a/m4/strtol.m4
+++ b/m4/strtol.m4
@@ -1,10 +1,8 @@
-# strtol.m4 serial 2
+# strtol.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_STRTOL],
[
diff --git a/m4/strtoll.m4 b/m4/strtoll.m4
index ce2d87cfdc..76f8065490 100644
--- a/m4/strtoll.m4
+++ b/m4/strtoll.m4
@@ -1,10 +1,8 @@
-# strtoll.m4 serial 2
+# strtoll.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_FUNC_STRTOLL],
[
diff --git a/m4/strtoul.m4 b/m4/strtoul.m4
index a76fef6d85..512cd09a48 100644
--- a/m4/strtoul.m4
+++ b/m4/strtoul.m4
@@ -1,10 +1,8 @@
-# strtoul.m4 serial 1
+# strtoul.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_STRTOUL],
[
diff --git a/m4/strtoull.m4 b/m4/strtoull.m4
index fd0a636151..398a86d187 100644
--- a/m4/strtoull.m4
+++ b/m4/strtoull.m4
@@ -1,10 +1,8 @@
-# strtoull.m4 serial 2
+# strtoull.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_FUNC_STRTOULL],
[
diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4
index 84d42ff16f..197858712f 100644
--- a/m4/strtoumax.m4
+++ b/m4/strtoumax.m4
@@ -1,10 +1,8 @@
-# strtoumax.m4 serial 4
+# strtoumax.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_STRTOUMAX],
[
diff --git a/m4/strverscmp.m4 b/m4/strverscmp.m4
index bb82336f58..9f36c6e24d 100644
--- a/m4/strverscmp.m4
+++ b/m4/strverscmp.m4
@@ -1,10 +1,8 @@
-# strverscmp.m4 serial 1
+# strverscmp.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_STRVERSCMP],
[
@@ -21,4 +19,3 @@ AC_DEFUN([gl_FUNC_STRVERSCMP],
AC_DEFUN([gl_PREREQ_STRVERSCMP], [
:
])
-
diff --git a/m4/sysexits.m4 b/m4/sysexits.m4
index 31386cec0e..aaa94e8493 100644
--- a/m4/sysexits.m4
+++ b/m4/sysexits.m4
@@ -1,10 +1,8 @@
-# sysexits.m4 serial 1
+# sysexits.m4 serial 2
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_SYSEXITS],
[
diff --git a/m4/time_r.m4 b/m4/time_r.m4
index 5f5369871c..42ba66c843 100644
--- a/m4/time_r.m4
+++ b/m4/time_r.m4
@@ -1,12 +1,9 @@
dnl Reentrant time functions like localtime_r.
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.
dnl Written by Paul Eggert.
diff --git a/m4/timegm.m4 b/m4/timegm.m4
index 94305aefa9..82e9d66be4 100644
--- a/m4/timegm.m4
+++ b/m4/timegm.m4
@@ -1,10 +1,8 @@
-# timegm.m4 serial 2
+# timegm.m4 serial 3
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_FUNC_TIMEGM],
[
diff --git a/m4/timespec.m4 b/m4/timespec.m4
index 5a346112e8..81776e2e31 100644
--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -1,4 +1,9 @@
-#serial 8
+#serial 9
+
+# 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.
dnl From Jim Meyering
diff --git a/m4/tm_gmtoff.m4 b/m4/tm_gmtoff.m4
index 74041c6a79..cb0b3c884c 100644
--- a/m4/tm_gmtoff.m4
+++ b/m4/tm_gmtoff.m4
@@ -1,10 +1,8 @@
-# tm_gmtoff.m4 serial 1
+# tm_gmtoff.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_TM_GMTOFF],
[
diff --git a/m4/tzset.m4 b/m4/tzset.m4
index 6df4eb7f99..134080c54b 100644
--- a/m4/tzset.m4
+++ b/m4/tzset.m4
@@ -1,4 +1,10 @@
-#serial 1
+#serial 2
+
+# Copyright (C) 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.
+
# See if we have a working tzset function.
# If so, arrange to compile the wrapper function.
# For at least Solaris 2.5.1 and 2.6, this is necessary
diff --git a/m4/uint32_t.m4 b/m4/uint32_t.m4
index 8a3f16de29..1fb5e668fc 100644
--- a/m4/uint32_t.m4
+++ b/m4/uint32_t.m4
@@ -1,20 +1,9 @@
-# uint32_t.m4 serial 3
+# uint32_t.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 Paul Eggert.
diff --git a/m4/uintptr_t.m4 b/m4/uintptr_t.m4
index ea5ea4e53b..65264a58a4 100644
--- a/m4/uintptr_t.m4
+++ b/m4/uintptr_t.m4
@@ -1,20 +1,9 @@
-# uintptr_t.m4 serial 2
+# uintptr_t.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.
diff --git a/m4/unistd-safer.m4 b/m4/unistd-safer.m4
index 894fb71548..282e6579ec 100644
--- a/m4/unistd-safer.m4
+++ b/m4/unistd-safer.m4
@@ -1,10 +1,8 @@
-# unistd-safer.m4 serial 1
+# unistd-safer.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_UNISTD_SAFER],
[
diff --git a/m4/unlink-busy.m4 b/m4/unlink-busy.m4
index 2f5f27347e..e25d2ea404 100644
--- a/m4/unlink-busy.m4
+++ b/m4/unlink-busy.m4
@@ -1,9 +1,14 @@
-#serial 7
+#serial 8
dnl From J. David Anglin.
dnl HPUX and other systems can't unlink shared text that is being executed.
+# 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.
+
AC_DEFUN([gl_FUNC_UNLINK_BUSY_TEXT],
[dnl
AC_CACHE_CHECK([whether a running program can be unlinked],
diff --git a/m4/unlocked-io.m4 b/m4/unlocked-io.m4
index 5849e4a3ae..c536d2dd93 100644
--- a/m4/unlocked-io.m4
+++ b/m4/unlocked-io.m4
@@ -1,21 +1,11 @@
-# unlocked-io.m4 serial 10
+# unlocked-io.m4 serial 11
# 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
diff --git a/m4/uptime.m4 b/m4/uptime.m4
index 53323bfe25..680e30fdb1 100644
--- a/m4/uptime.m4
+++ b/m4/uptime.m4
@@ -1,4 +1,9 @@
-#serial 6
+#serial 7
+
+# Copyright (C) 1996, 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_PREREQ(2.13)
diff --git a/m4/userspec.m4 b/m4/userspec.m4
index 902e2345de..0dd254c7d1 100644
--- a/m4/userspec.m4
+++ b/m4/userspec.m4
@@ -1,10 +1,8 @@
-# userspec.m4 serial 4
+# userspec.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_USERSPEC],
[
diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4
index cf1881537f..56f1bce666 100644
--- a/m4/utimbuf.m4
+++ b/m4/utimbuf.m4
@@ -1,4 +1,11 @@
-#serial 6
+#serial 7
+
+# 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.
dnl From Jim Meyering
diff --git a/m4/utime.m4 b/m4/utime.m4
index 6762a50db8..967faa253b 100644
--- a/m4/utime.m4
+++ b/m4/utime.m4
@@ -1,8 +1,13 @@
-#serial 6
+#serial 7
dnl From Jim Meyering
dnl Replace the utime function on systems that need it.
+# Copyright (C) 1998, 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 FIXME
AC_DEFUN([gl_FUNC_UTIME],
diff --git a/m4/utimecmp.m4 b/m4/utimecmp.m4
index 888192c73a..30f9343aef 100644
--- a/m4/utimecmp.m4
+++ b/m4/utimecmp.m4
@@ -1,9 +1,7 @@
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_UTIMECMP],
[
diff --git a/m4/utimens.m4 b/m4/utimens.m4
index 25a1337ce7..25ff2dcb74 100644
--- a/m4/utimens.m4
+++ b/m4/utimens.m4
@@ -1,9 +1,7 @@
dnl Copyright (C) 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_UTIMENS],
[
diff --git a/m4/utimes-null.m4 b/m4/utimes-null.m4
index 76512db6c5..927b877dd4 100644
--- a/m4/utimes-null.m4
+++ b/m4/utimes-null.m4
@@ -1,4 +1,9 @@
-#serial 5
+#serial 6
+
+# Copyright (C) 1998, 1999, 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 Shamelessly cloned from acspecific.m4's AC_FUNC_UTIME_NULL,
dnl then do case-insensitive s/utime/utimes/.
diff --git a/m4/vsnprintf.m4 b/m4/vsnprintf.m4
index 0ffac7aa39..cb8a9b18da 100644
--- a/m4/vsnprintf.m4
+++ b/m4/vsnprintf.m4
@@ -1,10 +1,8 @@
-# vsnprintf.m4 serial 1
+# vsnprintf.m4 serial 2
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_VSNPRINTF],
[
diff --git a/m4/xalloc.m4 b/m4/xalloc.m4
index 96797e9f5e..0e711f6416 100644
--- a/m4/xalloc.m4
+++ b/m4/xalloc.m4
@@ -1,10 +1,8 @@
-# xalloc.m4 serial 10
-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.
+# xalloc.m4 serial 11
+dnl Copyright (C) 2002, 2003, 2004 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_XALLOC],
[
diff --git a/m4/xgetcwd.m4 b/m4/xgetcwd.m4
index a0e2f3131e..09eecc7015 100644
--- a/m4/xgetcwd.m4
+++ b/m4/xgetcwd.m4
@@ -1,10 +1,8 @@
-# xgetcwd.m4 serial 3
+# xgetcwd.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_XGETCWD],
[
diff --git a/m4/xreadlink.m4 b/m4/xreadlink.m4
index 5d8e47f92e..f4b25bcf05 100644
--- a/m4/xreadlink.m4
+++ b/m4/xreadlink.m4
@@ -1,10 +1,8 @@
-# xreadlink.m4 serial 4
+# xreadlink.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_XREADLINK],
[
diff --git a/m4/xstrndup.m4 b/m4/xstrndup.m4
index 87c0ab8cb1..8a30ab158d 100644
--- a/m4/xstrndup.m4
+++ b/m4/xstrndup.m4
@@ -1,10 +1,8 @@
-# xstrndup.m4 serial 1
+# xstrndup.m4 serial 2
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_XSTRNDUP],
[
diff --git a/m4/xstrtod.m4 b/m4/xstrtod.m4
index 93528c2f51..fd761dfd6e 100644
--- a/m4/xstrtod.m4
+++ b/m4/xstrtod.m4
@@ -1,10 +1,8 @@
-# xstrtod.m4 serial 2
+# xstrtod.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.
# Prerequisites of lib/xstrtod.c.
AC_DEFUN([gl_XSTRTOD],
diff --git a/m4/xstrtoimax.m4 b/m4/xstrtoimax.m4
index 065912583b..ca1d2d57c7 100644
--- a/m4/xstrtoimax.m4
+++ b/m4/xstrtoimax.m4
@@ -1,6 +1,11 @@
-#serial 4
+#serial 5
dnl Cloned from xstrtoumax.m4. Keep these files in sync.
+dnl Copyright (C) 2001, 2003, 2004 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_XSTRTOIMAX],
[
dnl Prerequisites of lib/xstrtoimax.c.
diff --git a/m4/xstrtol.m4 b/m4/xstrtol.m4
index bed760c823..2d76d2ff9a 100644
--- a/m4/xstrtol.m4
+++ b/m4/xstrtol.m4
@@ -1,10 +1,8 @@
-# xstrtol.m4 serial 4
+# xstrtol.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_XSTRTOL],
[
diff --git a/m4/xstrtoumax.m4 b/m4/xstrtoumax.m4
index a0fbcc36a9..afac77b382 100644
--- a/m4/xstrtoumax.m4
+++ b/m4/xstrtoumax.m4
@@ -1,6 +1,11 @@
-#serial 6
+#serial 7
dnl Cloned from xstrtoimax.m4. Keep these files in sync.
+dnl Copyright (C) 1999, 2000, 2001, 2003, 2004 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_XSTRTOUMAX],
[
dnl Prerequisites of lib/xstrtoumax.c.
diff --git a/m4/yesno.m4 b/m4/yesno.m4
index d886b12ab1..ae20a19c2f 100644
--- a/m4/yesno.m4
+++ b/m4/yesno.m4
@@ -1,10 +1,8 @@
-# yesno.m4 serial 2
+# yesno.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_YESNO],
[