Sync from gnulib.

diff --git a/config/ChangeLog b/config/ChangeLog
index b5bc0b7e3448707c7b9827164c0cd552214979cf..9c5a233a319db337433be749ccf1fb8c620bb8d2 100644 (file)
--- 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 0f84ac2c51e26d3ad235d42a426233e2a4a46537..987b17d814153a566eda7829e10959a295ba42d7 100644 (file)
--- 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 5ea47f066d6f9687c84c98c225e89f68817dabb6..34cb442875cdd7f793dd6a27ee4bb753c1d2eb4f 100644 (file)
--- 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 9bb3e558cb8bc197bced81d4b8278e21c047b8cf..6b3662d61d74ac843bbdd9fb3656269187a77061 100644 (file)
--- 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 cc6ef9264bcf7ebe380165f0d608d9cad73093f4..bc1bae95de4f8104a29073f1bc3969f792fb70a0 100644 (file)
--- 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 9ec0024484dc9ebfa1114f813455fb7be8fbd8b2..474862fe3a3a56c761386ee37d6f6982d944501f 100644 (file)
--- 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 10490b8eccd09e7a5e51c07c9ea1d4e0e7d96cd3..eef75d76777f7201ea79b97f5cd99bbacf54ddfd 100644 (file)
--- 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 a93b3c57520d3acbd7d526bcc6730b4402d87ace..2660633d74f356b05c15ba2071d3588690a33747 100644 (file)
--- 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 59535ebcff51de01319aae4a83239e006c6b8795..a6e67ec498ff4619fc2c5d5be2c27a2fa5630e8a 100644 (file)
--- 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 aca0df9ce5144c9a3cb04296840c8986ef9be5c3..adcfd06c958648721a0b6d30383454b09f4d5ad6 100644 (file)
--- 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 7e6cea3d1cfad0bfcc1e86fc18fe424040986bab..8c28ca305697a80f7bad8f0cd2b9111f26fe3c0b 100644 (file)
--- 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 32ca2242e0493c92c896c4a733c81cd7fa0fa00a..d95fd9861322c3840eb729e27e5992ba464c3a25 100644 (file)
--- 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 c5f3579827e7527ce83b60c2049c0b644bb6cb01..654c41589436ee916892e9820bfe436336ecad33 100644 (file)
--- 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 859db149537ba8973feb3c56a4d43e674e169b15..44b16523cc9add450d8f63c01b35e2e4bdf6eefd 100644 (file)
--- 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 79bba8763e1ecbd62e1d90cd0ab264ac883f6488..a5d075d96875a5e9f432467c3b84054efbf59379 100644 (file)
--- 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 1f3d22848bcd3ea1fcfebe72bd1a798756c754e1..a1f22b2e0c61814a402cfae3a76122fa0786cadd 100644 (file)
--- 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 38aeaec19f2779ee0aa97b704ac27daa52c9cd56..96c4e2c3396c5d9193446f1893f1cdc4c4497344 100644 (file)
--- 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 eeb200d266db84b74456a376eabd7cb6f365fbb3..3538b8036c360a5d700d44b55aefed52e2a883da 100644 (file)
--- 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 8aff5a9d206a2077c670d74ed997b5af111c1788..70d693002f544ed7f36d9782b044125974c2c088 100644 (file)
--- 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 1333d2f57079409b11cdcfaee79ca8b8f5baaef3..40cd7ce02df6d355145e3eea5c70e6ee9fc3096a 100644 (file)
--- 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 028422b6121af68a51152c5aaf549133e4da3d77..7b399e012828f10870999edcb98757ba07217d72 100644 (file)
--- 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 3d8768ecbec86f98a90e4014ab55d913808eb50f..2eee1a64ffe61374c4dce4bf78d21e158ecc877d 100644 (file)
--- 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 a07f51bc154b8beaccfcec07fa4c8cee0fbe39af..df2a275c2eab6a08d7d0b65fa7ee4e6ae230c7e9 100644 (file)
--- 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 ffa6ece3bf17d0a7b23c56a298b476bba730c722..878e5311d5a8ca62d074b54646dbe440874bc46d 100644 (file)
--- 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 fbff0fe4e3661f4389cec92ac64c2e27fb61e1f7..a96168d88e527570bcd760b166e9f6f10295a215 100644 (file)
--- 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 3c30d8ae300ccf8801bf9e314ddf5d96bf9e8c71..27b0e59e6eb04dc50cb3281cab998ad5d62dba78 100644 (file)
--- 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 ec53e14db86a6316fab7be3c1d6d94c40d07b43d..b4a7f55d7ab3a6f6418c64666be4286d611e71c0 100644 (file)
--- 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 deb01bc9638ca8e31a91b9e53ca906399d55b255..b096e7f7fbcd6bd89390b34563feda305fc6ee2d 100644 (file)
--- 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 cf3292b2ae30321d2362ecfc0ede01829977086f..775561ddd884db96253123d27cabc43a1e715ff9 100644 (file)
--- 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 88d5e4c206697ed9bf98e040edfd603ec2213bf7..4c76be1ff61c29415119dc63f2feeb95d5fd6962 100644 (file)
--- 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 dc1f54f1069c0e1b71b85dc13af9f17177bf2eb2..048f593698ba151c8c47f25b90df5c87c54e8aa0 100644 (file)
--- 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 56b7ea43367c75907cc01df3d452fe4a82001b71..19b379fee4bc4ac06ab0412c386b3c692444ecc6 100644 (file)
--- 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 b25b7d2440b8c970f5d657d3c902ce3a4a9eaf4b..3f6b4bfcbf44e62ca8d34aa42aa8c1bf7632679f 100644 (file)
--- 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 063c4344e3c31ef60946237129616e288dbda6f0..3355f35aa3ffef364fc812923db663ff1564292a 100644 (file)
--- 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 b3282661b28d80830959cd390bc92de361f36f31..ce8d92fb12f005870c0a0f4785e448e13045d9f2 100644 (file)
--- 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 3fd25d0ce970ee81db08d3a3210c3f0bf555a3b0..40ace46a727698616220d4794ad1b1ec8ab714d5 100644 (file)
--- 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 b450ffbb3ddf5d7951339e0b3978c1a9af2d0bac..95650040b45257c05d882f7aa4a2d408033b7031 100644 (file)
--- 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 01425c4960d4363203d48659073c23efbffd6d01..68360684eeef77885ea6f7bc9bff63d954beb8ee 100644 (file)
--- 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 20c2c0a46543549988ebe8692afa67db392f35bf..0fe0f73cde6334f028e04169832c079dd04cbcf0 100644 (file)
--- 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 a2bc218ce79592e7f6128fc99a9004182242364d..bf83ed7464ff34359400f2a52f3abb8b780b0551 100644 (file)
--- 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 f51e3d66a780a3843747eb65c679cde28e993bc8..49fc3402d4d9706117c2b53afe123b6f8821b304 100644 (file)
--- 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 1123ccb8372c6b7f4fce80b51c8e53b723bd23a7..dee10ccc3ee641a63153f7b29ae2339c1e56c723 100644 (file)
--- 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 3e7ea782802dd6fd7280297916371f10647baeba..9edd52774d24a2bb3c8830db0a8106f8c2aefc72 100644 (file)
--- 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 784516cc31e3421af8ffeac262122d327670a60c..ba74b3f6e3a4d6becd406df6eb20cdc6f4b67fd4 100644 (file)
--- 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 a116949da5d2e98fab101f9224f18b38bf4b6235..7ff3430350505b23db6349c2224752f1fdf8a19f 100644 (file)
--- 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 1d00d938dedf65ffcc6a88be2b6449013b8383b6..385e92edd156039d493304ebbc17f3a734531356 100644 (file)
--- 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 d8fd1ec5c3b30d0147f1794e8cfb1f36dc874f15..cde2129a97273cfbab4ad5adc811ec34dfd5d59e 100644 (file)
--- 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 3d8d21594c0e1c020424f9c24edad66231f6bc59..b8fff9c86fdbda95e007a0406fab3a8b1293d89e 100644 (file)
--- 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.