From 15ac53209fcbbb55dfa6acdad49531d4cadcec5e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 22 Jan 2005 06:25:53 +0000 Subject: [PATCH] Sync from gnulib. --- config/ChangeLog | 4 ++++ config/config.sub | 4 ++-- lib/ChangeLog | 7 +++++++ lib/error.c | 6 ++---- m4/ChangeLog | 16 ++++++++++++++++ m4/allocsa.m4 | 8 +++----- m4/chdir-long.m4 | 10 ++++++++-- m4/chown.m4 | 18 ++++++++++++++---- m4/codeset.m4 | 8 +++----- m4/eealloc.m4 | 8 +++----- m4/eoverflow.m4 | 8 +++----- m4/glibc21.m4 | 8 +++----- m4/iconv.m4 | 8 +++----- m4/intmax_t.m4 | 8 +++----- m4/inttypes_h.m4 | 8 +++----- m4/lchown.m4 | 7 ++++++- m4/lib-ld.m4 | 8 +++----- m4/lib-link.m4 | 8 +++----- m4/lib-prefix.m4 | 8 +++----- m4/longdouble.m4 | 8 +++----- m4/longlong.m4 | 8 +++----- m4/mbrtowc.m4 | 8 +++----- m4/mbstate_t.m4 | 8 +++----- m4/mbswidth.m4 | 8 +++----- m4/mempcpy.m4 | 10 ++++------ m4/openat.m4 | 21 +++++---------------- m4/readlink.m4 | 8 +++----- m4/safe-read.m4 | 8 +++----- m4/safe-write.m4 | 8 +++----- m4/setenv.m4 | 8 +++----- m4/signed.m4 | 8 +++----- m4/ssize_t.m4 | 8 +++----- m4/stdbool.m4 | 20 ++++---------------- m4/stdint_h.m4 | 8 +++----- m4/stpcpy.m4 | 8 +++----- m4/strcase.m4 | 8 +++----- m4/strcspn.m4 | 8 +++----- m4/strpbrk.m4 | 8 +++----- m4/strstr.m4 | 8 +++----- m4/uintmax_t.m4 | 8 +++----- m4/ullong_max.m4 | 19 ++++--------------- m4/ulonglong.m4 | 8 +++----- m4/unicodeio.m4 | 8 +++----- m4/utimes.m4 | 7 +++++++ m4/vasnprintf.m4 | 8 +++----- m4/vasprintf.m4 | 8 +++----- m4/wchar_t.m4 | 8 +++----- m4/wint_t.m4 | 8 +++----- 48 files changed, 188 insertions(+), 241 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index b5bc0b7e34..9c5a233a31 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2005-01-21 Paul Eggert + + * config.sub: Sync from gnulib. + 2004-12-17 Jim Meyering * install-sh: Sync from gnulib. diff --git a/config/config.sub b/config/config.sub index 0f84ac2c51..987b17d814 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 5ea47f066d..34cb442875 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2005-01-21 Paul Eggert + + 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 ; not needed. + 2005-01-20 Paul Eggert * save-cwd.c (save_cwd): Remove code to support the case diff --git a/lib/error.c b/lib/error.c index 9bb3e558cb..6b3662d61d 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 #include -#ifdef _LIBC -# include -#else +#if !_LIBC && ENABLE_NLS # include "gettext.h" #endif diff --git a/m4/ChangeLog b/m4/ChangeLog index cc6ef9264b..bc1bae95de 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,19 @@ +2005-01-21 Bruno Haible + + 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 * 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 9ec0024484..474862fe3a 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 10490b8ecc..eef75d7677 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 a93b3c5752..2660633d74 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 59535ebcff..a6e67ec498 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 aca0df9ce5..adcfd06c95 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 7e6cea3d1c..8c28ca3056 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 32ca2242e0..d95fd98613 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 c5f3579827..654c415894 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 859db14953..44b16523cc 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 79bba8763e..a5d075d968 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 1f3d22848b..a1f22b2e0c 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 38aeaec19f..96c4e2c339 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 eeb200d266..3538b8036c 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 8aff5a9d20..70d693002f 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 1333d2f570..40cd7ce02d 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 028422b612..7b399e0128 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 3d8768ecbe..2eee1a64ff 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 a07f51bc15..df2a275c2e 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 ffa6ece3bf..878e5311d5 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 fbff0fe4e3..a96168d88e 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 3c30d8ae30..27b0e59e6e 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 ec53e14db8..b4a7f55d7a 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 deb01bc963..b096e7f7fb 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 cf3292b2ae..775561ddd8 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 88d5e4c206..4c76be1ff6 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 dc1f54f106..048f593698 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 56b7ea4336..19b379fee4 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 b25b7d2440..3f6b4bfcbf 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 if it is not supported. diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4 index 063c4344e3..3355f35aa3 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 b3282661b2..ce8d92fb12 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 3fd25d0ce9..40ace46a72 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 b450ffbb3d..95650040b4 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 01425c4960..68360684ee 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 20c2c0a465..0fe0f73cde 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 a2bc218ce7..bf83ed7464 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 f51e3d66a7..49fc3402d4 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 1123ccb837..dee10ccc3e 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 3e7ea78280..9edd52774d 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 784516cc31..ba74b3f6e3 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 a116949da5..7ff3430350 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 1d00d938de..385e92edd1 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 d8fd1ec5c3..cde2129a97 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 has the 'wchar_t' type. diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 index 3d8d21594c..b8fff9c86f 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 has the 'wint_t' type. -- 2.47.3