summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/ChangeLog4
-rw-r--r--config/config.sub4
-rw-r--r--lib/ChangeLog7
-rw-r--r--lib/error.c6
-rw-r--r--m4/ChangeLog16
-rw-r--r--m4/allocsa.m48
-rw-r--r--m4/chdir-long.m410
-rw-r--r--m4/chown.m418
-rw-r--r--m4/codeset.m48
-rw-r--r--m4/eealloc.m48
-rw-r--r--m4/eoverflow.m48
-rw-r--r--m4/glibc21.m48
-rw-r--r--m4/iconv.m48
-rw-r--r--m4/intmax_t.m48
-rw-r--r--m4/inttypes_h.m48
-rw-r--r--m4/lchown.m47
-rw-r--r--m4/lib-ld.m48
-rw-r--r--m4/lib-link.m48
-rw-r--r--m4/lib-prefix.m48
-rw-r--r--m4/longdouble.m48
-rw-r--r--m4/longlong.m48
-rw-r--r--m4/mbrtowc.m48
-rw-r--r--m4/mbstate_t.m48
-rw-r--r--m4/mbswidth.m48
-rw-r--r--m4/mempcpy.m410
-rw-r--r--m4/openat.m421
-rw-r--r--m4/readlink.m48
-rw-r--r--m4/safe-read.m48
-rw-r--r--m4/safe-write.m48
-rw-r--r--m4/setenv.m48
-rw-r--r--m4/signed.m48
-rw-r--r--m4/ssize_t.m48
-rw-r--r--m4/stdbool.m420
-rw-r--r--m4/stdint_h.m48
-rw-r--r--m4/stpcpy.m48
-rw-r--r--m4/strcase.m48
-rw-r--r--m4/strcspn.m48
-rw-r--r--m4/strpbrk.m48
-rw-r--r--m4/strstr.m48
-rw-r--r--m4/uintmax_t.m48
-rw-r--r--m4/ullong_max.m419
-rw-r--r--m4/ulonglong.m48
-rw-r--r--m4/unicodeio.m48
-rw-r--r--m4/utimes.m47
-rw-r--r--m4/vasnprintf.m48
-rw-r--r--m4/vasprintf.m48
-rw-r--r--m4/wchar_t.m48
-rw-r--r--m4/wint_t.m48
48 files changed, 188 insertions, 241 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index b5bc0b7e3..9c5a233a3 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-21 Paul Eggert <eggert@cs.ucla.edu>
+
+ * config.sub: Sync from gnulib.
+
2004-12-17 Jim Meyering <jim@meyering.net>
* install-sh: Sync from gnulib.
diff --git a/config/config.sub b/config/config.sub
index 0f84ac2c5..987b17d81 100644
--- a/config/config.sub
+++ b/config/config.sub
@@ -237,7 +237,7 @@ case $basic_machine in
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | mcore \
+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -310,7 +310,7 @@ case $basic_machine in
| ip2k-* | iq2000-* \
| m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 5ea47f066..34cb44287 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-21 Paul Eggert <eggert@cs.ucla.edu>
+
+ Sync from gnulib.
+ * error.c [!_LIBC && !ENABLE_NLS]: Do not include "gettext.h";
+ not needed. This removes a dependency on the gettext module.
+ [defined _LIBC]: Do not include <libintl.h>; not needed.
+
2005-01-20 Paul Eggert <eggert@cs.ucla.edu>
* save-cwd.c (save_cwd): Remove code to support the case
diff --git a/lib/error.c b/lib/error.c
index 9bb3e558c..6b3662d61 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -1,5 +1,5 @@
/* Error handler for noninteractive utilities
- Copyright (C) 1990-1998, 2000-2002, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1990-1998, 2000-2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
@@ -29,9 +29,7 @@
#include <stdlib.h>
#include <string.h>
-#ifdef _LIBC
-# include <libintl.h>
-#else
+#if !_LIBC && ENABLE_NLS
# include "gettext.h"
#endif
diff --git a/m4/ChangeLog b/m4/ChangeLog
index cc6ef9264..bc1bae95d 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,19 @@
+2005-01-21 Bruno Haible <bruno@clisp.org>
+
+ Sync from gnulib.
+ * m4/allocsa.m4, m4/chdir-long.m4, m4/chown.m4, m4/codeset.m4,
+ m4/eealloc.m4, m4/eoverflow.m4, m4/glibc21.m4, m4/iconv.m4,
+ m4/intmax_t.m4, m4/inttypes_h.m4, m4/lchown.m4, m4/lib-ld.m4,
+ m4/lib-link.m4, m4/lib-prefix.m4, m4/longdouble.m4,
+ m4/longlong.m4, m4/mbrtowc.m4, m4/mbstate_t.m4, m4/mbswidth.m4,
+ m4/mempcpy.m4, m4/openat.m4, m4/readlink.m4, m4/safe-read.m4,
+ m4/safe-write.m4, m4/setenv.m4, m4/signed.m4, m4/ssize_t.m4,
+ m4/stdbool.m4, m4/stdint_h.m4, m4/stpcpy.m4, m4/strcase.m4,
+ m4/strcspn.m4, m4/strpbrk.m4, m4/strstr.m4, m4/uintmax_t.m4,
+ m4/ullong_max.m4, m4/ulonglong.m4, m4/unicodeio.m4, m4/utimes.m4,
+ m4/vasnprintf.m4, m4/vasprintf.m4, m4/wchar_t.m4, m4/wint_t.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/allocsa.m4 b/m4/allocsa.m4
index 9ec002448..474862fe3 100644
--- a/m4/allocsa.m4
+++ b/m4/allocsa.m4
@@ -1,10 +1,8 @@
# allocsa.m4 serial 3
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_ALLOCSA],
[
diff --git a/m4/chdir-long.m4 b/m4/chdir-long.m4
index 10490b8ec..eef75d767 100644
--- a/m4/chdir-long.m4
+++ b/m4/chdir-long.m4
@@ -1,12 +1,18 @@
-#serial 3
+#serial 4
-# Written by Jim Meyering.
# Use Gnulib's robust chdir function.
# It can handle arbitrarily long directory names, which means
# that when it is given the name of an existing directory, it
# never fails with ENAMETOOLONG.
# Arrange to compile chdir-long.c only on systems that define PATH_MAX.
+dnl Copyright (C) 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.
+
+# Written by Jim Meyering.
+
AC_DEFUN([gl_FUNC_CHDIR_LONG],
[
AC_LIBSOURCES([chdir-long.c, chdir-long.h])
diff --git a/m4/chown.m4 b/m4/chown.m4
index a93b3c575..2660633d7 100644
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -1,7 +1,17 @@
-#serial 11
-# Determine whether we need the chown wrapper. chown should accept
-# arguments of -1 for uid and gid, and it should dereference symlinks.
-# If it doesn't, arrange to use the replacement function.
+#serial 12
+# Determine whether we need the chown wrapper.
+
+dnl Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free
+dnl 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.
+
+# chown should accept arguments of -1 for uid and gid, and it should
+# dereference symlinks. If it doesn't, arrange to use the replacement
+# function.
+
# From Jim Meyering.
AC_DEFUN([gl_FUNC_CHOWN],
diff --git a/m4/codeset.m4 b/m4/codeset.m4
index 59535ebcf..a6e67ec49 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,10 +1,8 @@
# codeset.m4 serial AM1 (gettext-0.10.40)
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.
+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.
diff --git a/m4/eealloc.m4 b/m4/eealloc.m4
index aca0df9ce..adcfd06c9 100644
--- a/m4/eealloc.m4
+++ b/m4/eealloc.m4
@@ -1,10 +1,8 @@
# eealloc.m4 serial 1
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_EEALLOC],
[
diff --git a/m4/eoverflow.m4 b/m4/eoverflow.m4
index 7e6cea3d1..8c28ca305 100644
--- a/m4/eoverflow.m4
+++ b/m4/eoverflow.m4
@@ -1,10 +1,8 @@
# eoverflow.m4 serial 1
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 From Bruno Haible.
diff --git a/m4/glibc21.m4 b/m4/glibc21.m4
index 32ca2242e..d95fd9861 100644
--- a/m4/glibc21.m4
+++ b/m4/glibc21.m4
@@ -1,10 +1,8 @@
# glibc21.m4 serial 3
dnl Copyright (C) 2000-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.
# Test for the GNU C Library, version 2.1 or newer.
# From Bruno Haible.
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index c5f357982..654c41589 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,10 +1,8 @@
# iconv.m4 serial AM4 (gettext-0.11.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.
+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.
diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4
index 859db1495..44b16523c 100644
--- a/m4/intmax_t.m4
+++ b/m4/intmax_t.m4
@@ -1,10 +1,8 @@
# intmax_t.m4 serial 4
dnl Copyright (C) 1997-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 Paul Eggert.
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index 79bba8763..a5d075d96 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -1,10 +1,8 @@
# inttypes_h.m4 serial 6
dnl Copyright (C) 1997-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 Paul Eggert.
diff --git a/m4/lchown.m4 b/m4/lchown.m4
index 1f3d22848..a1f22b2e0 100644
--- a/m4/lchown.m4
+++ b/m4/lchown.m4
@@ -1,4 +1,9 @@
-#serial 5
+#serial 6
+
+dnl Copyright (C) 1998, 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.
dnl From Jim Meyering.
dnl Provide lchown on systems that lack it.
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
index 38aeaec19..96c4e2c33 100644
--- a/m4/lib-ld.m4
+++ b/m4/lib-ld.m4
@@ -1,10 +1,8 @@
# lib-ld.m4 serial 3 (gettext-0.13)
dnl Copyright (C) 1996-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 Subroutines of libtool.m4,
dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index eeb200d26..3538b8036 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,10 +1,8 @@
# lib-link.m4 serial 4 (gettext-0.12)
dnl Copyright (C) 2001-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 Bruno Haible.
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 8aff5a9d2..70d693002 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,10 +1,8 @@
# lib-prefix.m4 serial 3 (gettext-0.13)
dnl Copyright (C) 2001-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 Bruno Haible.
diff --git a/m4/longdouble.m4 b/m4/longdouble.m4
index 1333d2f57..40cd7ce02 100644
--- a/m4/longdouble.m4
+++ b/m4/longdouble.m4
@@ -1,10 +1,8 @@
# longdouble.m4 serial 1 (gettext-0.12)
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 Bruno Haible.
dnl Test whether the compiler supports the 'long double' type.
diff --git a/m4/longlong.m4 b/m4/longlong.m4
index 028422b61..7b399e012 100644
--- a/m4/longlong.m4
+++ b/m4/longlong.m4
@@ -1,10 +1,8 @@
# longlong.m4 serial 5
dnl Copyright (C) 1999-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 Paul Eggert.
diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4
index 3d8768ecb..2eee1a64f 100644
--- a/m4/mbrtowc.m4
+++ b/m4/mbrtowc.m4
@@ -1,10 +1,8 @@
# mbrtowc.m4 serial 7
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 Paul Eggert
diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4
index a07f51bc1..df2a275c2 100644
--- a/m4/mbstate_t.m4
+++ b/m4/mbstate_t.m4
@@ -1,10 +1,8 @@
# mbstate_t.m4 serial 9
dnl Copyright (C) 2000, 2001, 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.
# From Paul Eggert.
diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4
index ffa6ece3b..878e5311d 100644
--- a/m4/mbswidth.m4
+++ b/m4/mbswidth.m4
@@ -1,10 +1,8 @@
# mbswidth.m4 serial 11
dnl Copyright (C) 2000-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 autoconf tests required for use of mbswidth.c
dnl From Bruno Haible.
diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4
index fbff0fe4e..a96168d88 100644
--- a/m4/mempcpy.m4
+++ b/m4/mempcpy.m4
@@ -1,10 +1,8 @@
-# mempcpy.m4 serial 2
+# mempcpy.m4 serial 3
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_FUNC_MEMPCPY],
[
diff --git a/m4/openat.m4 b/m4/openat.m4
index 3c30d8ae3..27b0e59e6 100644
--- a/m4/openat.m4
+++ b/m4/openat.m4
@@ -1,21 +1,10 @@
-#serial 2
+#serial 3
# See if we need to use our replacement for Solaris' openat function.
-# 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.
+dnl Copyright (C) 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.
# Written by Jim Meyering.
diff --git a/m4/readlink.m4 b/m4/readlink.m4
index ec53e14db..b4a7f55d7 100644
--- a/m4/readlink.m4
+++ b/m4/readlink.m4
@@ -1,10 +1,8 @@
# readlink.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_FUNC_READLINK],
[
diff --git a/m4/safe-read.m4 b/m4/safe-read.m4
index deb01bc96..b096e7f7f 100644
--- a/m4/safe-read.m4
+++ b/m4/safe-read.m4
@@ -1,10 +1,8 @@
# safe-read.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_SAFE_READ],
[
diff --git a/m4/safe-write.m4 b/m4/safe-write.m4
index cf3292b2a..775561ddd 100644
--- a/m4/safe-write.m4
+++ b/m4/safe-write.m4
@@ -1,10 +1,8 @@
# safe-write.m4 serial 1
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_SAFE_WRITE],
[
diff --git a/m4/setenv.m4 b/m4/setenv.m4
index 88d5e4c20..4c76be1ff 100644
--- a/m4/setenv.m4
+++ b/m4/setenv.m4
@@ -1,10 +1,8 @@
# setenv.m4 serial 5
dnl Copyright (C) 2001-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([gt_FUNC_SETENV],
[
diff --git a/m4/signed.m4 b/m4/signed.m4
index dc1f54f10..048f59369 100644
--- a/m4/signed.m4
+++ b/m4/signed.m4
@@ -1,10 +1,8 @@
# signed.m4 serial 1 (gettext-0.10.40)
dnl Copyright (C) 2001-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.
dnl From Bruno Haible.
diff --git a/m4/ssize_t.m4 b/m4/ssize_t.m4
index 56b7ea433..19b379fee 100644
--- a/m4/ssize_t.m4
+++ b/m4/ssize_t.m4
@@ -1,10 +1,8 @@
# ssize_t.m4 serial 3 (gettext-0.13)
dnl Copyright (C) 2001-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 Bruno Haible.
dnl Test whether ssize_t is defined.
diff --git a/m4/stdbool.m4 b/m4/stdbool.m4
index b25b7d244..3f6b4bfcb 100644
--- a/m4/stdbool.m4
+++ b/m4/stdbool.m4
@@ -1,21 +1,9 @@
# Check for stdbool.h that conforms to C99.
-# Copyright (C) 2002-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.
+dnl Copyright (C) 2002-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.
# Prepare for substituting <stdbool.h> if it is not supported.
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
index 063c4344e..3355f35aa 100644
--- a/m4/stdint_h.m4
+++ b/m4/stdint_h.m4
@@ -1,10 +1,8 @@
# stdint_h.m4 serial 5
dnl Copyright (C) 1997-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 Paul Eggert.
diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4
index b3282661b..ce8d92fb1 100644
--- a/m4/stpcpy.m4
+++ b/m4/stpcpy.m4
@@ -1,10 +1,8 @@
# stpcpy.m4 serial 1
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_STPCPY],
[
diff --git a/m4/strcase.m4 b/m4/strcase.m4
index 3fd25d0ce..40ace46a7 100644
--- a/m4/strcase.m4
+++ b/m4/strcase.m4
@@ -1,10 +1,8 @@
# strcase.m4 serial 1
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_STRCASE],
[
diff --git a/m4/strcspn.m4 b/m4/strcspn.m4
index b450ffbb3..95650040b 100644
--- a/m4/strcspn.m4
+++ b/m4/strcspn.m4
@@ -1,10 +1,8 @@
# strcspn.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_STRCSPN],
[
diff --git a/m4/strpbrk.m4 b/m4/strpbrk.m4
index 01425c496..68360684e 100644
--- a/m4/strpbrk.m4
+++ b/m4/strpbrk.m4
@@ -1,10 +1,8 @@
# strpbrk.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_STRPBRK],
[
diff --git a/m4/strstr.m4 b/m4/strstr.m4
index 20c2c0a46..0fe0f73cd 100644
--- a/m4/strstr.m4
+++ b/m4/strstr.m4
@@ -1,10 +1,8 @@
# strstr.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_STRSTR],
[
diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
index a2bc218ce..bf83ed746 100644
--- a/m4/uintmax_t.m4
+++ b/m4/uintmax_t.m4
@@ -1,10 +1,8 @@
# uintmax_t.m4 serial 9
dnl Copyright (C) 1997-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 Paul Eggert.
diff --git a/m4/ullong_max.m4 b/m4/ullong_max.m4
index f51e3d66a..49fc3402d 100644
--- a/m4/ullong_max.m4
+++ b/m4/ullong_max.m4
@@ -1,20 +1,9 @@
# ullong_max.m4 - define ULLONG_MAX if necessary
-# Copyright (C) 2005 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.
+dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
# Written by Paul Eggert.
diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4
index 1123ccb83..dee10ccc3 100644
--- a/m4/ulonglong.m4
+++ b/m4/ulonglong.m4
@@ -1,10 +1,8 @@
# ulonglong.m4 serial 4
dnl Copyright (C) 1999-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 Paul Eggert.
diff --git a/m4/unicodeio.m4 b/m4/unicodeio.m4
index 3e7ea7828..9edd52774 100644
--- a/m4/unicodeio.m4
+++ b/m4/unicodeio.m4
@@ -1,10 +1,8 @@
# unicodeio.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_UNICODEIO],
[
diff --git a/m4/utimes.m4 b/m4/utimes.m4
index 784516cc3..ba74b3f6e 100644
--- a/m4/utimes.m4
+++ b/m4/utimes.m4
@@ -1,3 +1,10 @@
+# Detect some bugs in glibc's implementation of utimes.
+
+dnl Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
# See if we need to work around bugs in glibc's implementation of
# utimes from 2003-07-12 to 2003-09-17.
# First, there was a bug that would make utimes set mtime
diff --git a/m4/vasnprintf.m4 b/m4/vasnprintf.m4
index a116949da..7ff343035 100644
--- a/m4/vasnprintf.m4
+++ b/m4/vasnprintf.m4
@@ -1,10 +1,8 @@
# vasnprintf.m4 serial 5
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_VASNPRINTF],
[
diff --git a/m4/vasprintf.m4 b/m4/vasprintf.m4
index 1d00d938d..385e92edd 100644
--- a/m4/vasprintf.m4
+++ b/m4/vasprintf.m4
@@ -1,10 +1,8 @@
# vasprintf.m4 serial 1
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_VASPRINTF],
[
diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4
index d8fd1ec5c..cde2129a9 100644
--- a/m4/wchar_t.m4
+++ b/m4/wchar_t.m4
@@ -1,10 +1,8 @@
# wchar_t.m4 serial 1 (gettext-0.12)
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 Bruno Haible.
dnl Test whether <stddef.h> has the 'wchar_t' type.
diff --git a/m4/wint_t.m4 b/m4/wint_t.m4
index 3d8d21594..b8fff9c86 100644
--- a/m4/wint_t.m4
+++ b/m4/wint_t.m4
@@ -1,10 +1,8 @@
# wint_t.m4 serial 1 (gettext-0.12)
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 From Bruno Haible.
dnl Test whether <wchar.h> has the 'wint_t' type.