Use an all-permissive copyright notice.

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index c9fba15ceb8885e193523dc47d40147a8c11156e..78d20a6152f5ec3977e520f5a86f7ffaff61f62c 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,13 @@
+2005-01-19  Bruno Haible  <bruno@clisp.org>
+
+       * ansi-c++.m4, codeset.m4, gettext.m4, glibc21.m4, glibc2.m4, iconv.m4:
+       * intdiv0.m4, intmax.m4, inttypes_h.m4, inttypes.m4, inttypes-pri.m4:
+       * isc-posix.m4, lcmessage.m4, longdouble.m4, longlong.m4, nls.m4:
+       * po.m4, printf-posix.m4, progtest.m4, signed.m4, size_max.m4:
+       * stdint_h.m4, uintmax_t.m4, ulonglong.m4, wchar_t.m4, wint_t.m4:
+       * xsize.m4:
+       Use an all-permissive copyright notice, recommended by RMS.
+
 2005-01-10  Bruno Haible  <bruno@clisp.org>
 
        * gettext.m4 (AM_GNU_GETTEXT): Declare _nl_expand_alias with an

diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am
index aadecfe40f88c8dd2c9fe73fb06431eeaf9bdac7..5f2dff342226d034090162e44e7779fff1f1f496 100644 (file)
--- a/gettext-runtime/m4/Makefile.am
+++ b/gettext-runtime/m4/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST = README \
 ansi-c++.m4 \
 codeset.m4 \
 gettext.m4 \
+glibc2.m4 \
 glibc21.m4 \
 iconv.m4 \
 intdiv0.m4 \

diff --git a/gettext-runtime/m4/Makefile.in b/gettext-runtime/m4/Makefile.in
index 56a633543ca7df87db932b2b29dda7de98688769..cce867c33a70b1092340e6fff4ce54b7b90d62ea 100644 (file)
--- a/gettext-runtime/m4/Makefile.in
+++ b/gettext-runtime/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33,6 +33,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = m4
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -51,6 +52,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/m4/fixautomake.m4 \
        $(top_srcdir)/../gettext-tools/m4/eealloc.m4 \
        $(top_srcdir)/../gettext-tools/m4/error.m4 \
        $(top_srcdir)/../gettext-tools/m4/extensions.m4 \
+       $(top_srcdir)/../gettext-tools/m4/getopt.m4 \
        $(top_srcdir)/../gettext-tools/m4/javacomp.m4 \
        $(top_srcdir)/../gettext-tools/m4/onceonly.m4 \
        $(top_srcdir)/../gettext-tools/m4/pathmax.m4 \
@@ -63,18 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/m4/fixautomake.m4 \
        $(top_srcdir)/../gettext-tools/m4/unlocked-io.m4 \
        $(top_srcdir)/../gettext-tools/m4/xreadlink.m4 \
        $(top_srcdir)/m4/ansi-c++.m4 $(top_srcdir)/m4/codeset.m4 \
-       $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
-       $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
-       $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
-       $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
-       $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/longdouble.m4 \
-       $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
-       $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
-       $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \
-       $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-       $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
-       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
-       $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+       $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+       $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \
+       $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
+       $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+       $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \
+       $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+       $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+       $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \
+       $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+       $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \
+       $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
@@ -126,6 +129,8 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GENCAT = @GENCAT@
+GETOPT_H = @GETOPT_H@
+GLIBC2 = @GLIBC2@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
@@ -154,6 +159,7 @@ INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LDFLAGS = @INTL_MACOSX_LDFLAGS@
 JAR = @JAR@
 JAVAC = @JAVAC@
 LDFLAGS = @LDFLAGS@
@@ -212,6 +218,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -249,6 +257,7 @@ EXTRA_DIST = README \
 ansi-c++.m4 \
 codeset.m4 \
 gettext.m4 \
+glibc2.m4 \
 glibc21.m4 \
 iconv.m4 \
 intdiv0.m4 \
@@ -372,7 +381,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-       -rm -f $(CONFIG_CLEAN_FILES)
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"

diff --git a/gettext-runtime/m4/ansi-c++.m4 b/gettext-runtime/m4/ansi-c++.m4
index cabd5bbdcb1c029b2c3bff60bd745cfc7c19cb4e..9056160e7724b96d9f7e52c1bd1796548cc17bbd 100644 (file)
--- a/gettext-runtime/m4/ansi-c++.m4
+++ b/gettext-runtime/m4/ansi-c++.m4
@@ -1,10 +1,8 @@
 # ansi-c++.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.
 

diff --git a/gettext-runtime/m4/codeset.m4 b/gettext-runtime/m4/codeset.m4
index 59535ebcff51de01319aae4a83239e006c6b8795..a6e67ec498ff4619fc2c5d5be2c27a2fa5630e8a 100644 (file)
--- a/gettext-runtime/m4/codeset.m4
+++ b/gettext-runtime/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/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4
index a7e234ae77eeaa68184ceabeaeb5d2ed4f884f68..ae6752cb9971a02f3cdb8323aadcb321dff86654 100644 (file)
--- a/gettext-runtime/m4/gettext.m4
+++ b/gettext-runtime/m4/gettext.m4
@@ -1,10 +1,8 @@
 # gettext.m4 serial 33 (gettext-0.14.2)
 dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free 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
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public

diff --git a/gettext-runtime/m4/glibc2.m4 b/gettext-runtime/m4/glibc2.m4
index baa1b502f9f99aa9c1b52b51f6d843b465c138b0..e8f5bfe6ed68396f4936a0e9a8364cf6a4926848 100644 (file)
--- a/gettext-runtime/m4/glibc2.m4
+++ b/gettext-runtime/m4/glibc2.m4
@@ -1,10 +1,8 @@
 # glibc2.m4 serial 1
 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.0 or newer.
 # From Bruno Haible.

diff --git a/gettext-runtime/m4/glibc21.m4 b/gettext-runtime/m4/glibc21.m4
index 32ca2242e0493c92c896c4a733c81cd7fa0fa00a..d95fd9861322c3840eb729e27e5992ba464c3a25 100644 (file)
--- a/gettext-runtime/m4/glibc21.m4
+++ b/gettext-runtime/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/gettext-runtime/m4/iconv.m4 b/gettext-runtime/m4/iconv.m4
index c5f3579827e7527ce83b60c2049c0b644bb6cb01..654c41589436ee916892e9820bfe436336ecad33 100644 (file)
--- a/gettext-runtime/m4/iconv.m4
+++ b/gettext-runtime/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/gettext-runtime/m4/intdiv0.m4 b/gettext-runtime/m4/intdiv0.m4
index 55dddcf1c24c26a63f303c48ac6ff33329404f99..b8d78176a6844669d85b1f364cfbccb1c6f5eb69 100644 (file)
--- a/gettext-runtime/m4/intdiv0.m4
+++ b/gettext-runtime/m4/intdiv0.m4
@@ -1,10 +1,8 @@
 # intdiv0.m4 serial 1 (gettext-0.11.3)
 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.
 
 dnl From Bruno Haible.
 

diff --git a/gettext-runtime/m4/intmax.m4 b/gettext-runtime/m4/intmax.m4
index 5626b1ef666f7aaa5cf1792158658005b9549f72..d99c999fdbde8d3a143b3426ae5c70af08c6b580 100644 (file)
--- a/gettext-runtime/m4/intmax.m4
+++ b/gettext-runtime/m4/intmax.m4
@@ -1,10 +1,8 @@
 # intmax.m4 serial 2 (gettext-0.14.2)
 dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free 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 system has the 'intmax_t' type, but don't attempt to

diff --git a/gettext-runtime/m4/inttypes-pri.m4 b/gettext-runtime/m4/inttypes-pri.m4
index fd007c312896a682b860395bc93e8aa429b528e4..4d56a9ad30c9a1907f95b69c57bb8f83ebf3277a 100644 (file)
--- a/gettext-runtime/m4/inttypes-pri.m4
+++ b/gettext-runtime/m4/inttypes-pri.m4
@@ -1,10 +1,8 @@
 # inttypes-pri.m4 serial 1 (gettext-0.11.4)
 dnl Copyright (C) 1997-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/gettext-runtime/m4/inttypes.m4 b/gettext-runtime/m4/inttypes.m4
index ab370ffe00569af2301295ce61cac7b642ed8e35..779bcea059d29123ca9d541e4dd7749ba2497980 100644 (file)
--- a/gettext-runtime/m4/inttypes.m4
+++ b/gettext-runtime/m4/inttypes.m4
@@ -1,10 +1,8 @@
 # inttypes.m4 serial 1 (gettext-0.11.4)
 dnl Copyright (C) 1997-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 Paul Eggert.
 

diff --git a/gettext-runtime/m4/inttypes_h.m4 b/gettext-runtime/m4/inttypes_h.m4
index 79bba8763e1ecbd62e1d90cd0ab264ac883f6488..a5d075d96875a5e9f432467c3b84054efbf59379 100644 (file)
--- a/gettext-runtime/m4/inttypes_h.m4
+++ b/gettext-runtime/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/gettext-runtime/m4/isc-posix.m4 b/gettext-runtime/m4/isc-posix.m4
index 1319dd1c70a8f59537309b119f1455b4fa6d0aa0..74dc8f26d880c55bc52d4e5fd158ae1fc1cde7ce 100644 (file)
--- a/gettext-runtime/m4/isc-posix.m4
+++ b/gettext-runtime/m4/isc-posix.m4
@@ -1,10 +1,8 @@
 # isc-posix.m4 serial 2 (gettext-0.11.2)
 dnl Copyright (C) 1995-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.
 
 # This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
 

diff --git a/gettext-runtime/m4/lcmessage.m4 b/gettext-runtime/m4/lcmessage.m4
index bf04a462f569cad741168deb3f9ddf7188e09bb6..19aa77e4f7d9346106ba24bbe57f21cda78ea35a 100644 (file)
--- a/gettext-runtime/m4/lcmessage.m4
+++ b/gettext-runtime/m4/lcmessage.m4
@@ -1,10 +1,8 @@
 # lcmessage.m4 serial 4 (gettext-0.14.2)
 dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free 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
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public

diff --git a/gettext-runtime/m4/longdouble.m4 b/gettext-runtime/m4/longdouble.m4
index 1333d2f57079409b11cdcfaee79ca8b8f5baaef3..40cd7ce02df6d355145e3eea5c70e6ee9fc3096a 100644 (file)
--- a/gettext-runtime/m4/longdouble.m4
+++ b/gettext-runtime/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/gettext-runtime/m4/longlong.m4 b/gettext-runtime/m4/longlong.m4
index 028422b6121af68a51152c5aaf549133e4da3d77..7b399e012828f10870999edcb98757ba07217d72 100644 (file)
--- a/gettext-runtime/m4/longlong.m4
+++ b/gettext-runtime/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/gettext-runtime/m4/nls.m4 b/gettext-runtime/m4/nls.m4
index 36bc49317c127c9b775ac81f1f327bea668c9b72..596c89f50d1030e66449ebb73cfa9ebfb2588c35 100644 (file)
--- a/gettext-runtime/m4/nls.m4
+++ b/gettext-runtime/m4/nls.m4
@@ -1,10 +1,8 @@
 # nls.m4 serial 1 (gettext-0.12)
 dnl Copyright (C) 1995-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
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public

diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4
index 68ff456e0078dcb5beffd4f55bab4165146d6ccf..ab43f0ecb67e17e38d722b3ba9a117bb08ffa07c 100644 (file)
--- a/gettext-runtime/m4/po.m4
+++ b/gettext-runtime/m4/po.m4
@@ -1,10 +1,8 @@
 # po.m4 serial 5 (gettext-0.14.2)
 dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free 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
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public

diff --git a/gettext-runtime/m4/printf-posix.m4 b/gettext-runtime/m4/printf-posix.m4
index 186ba6a6d16deed4c199eceb4ecc44c0c7a7d5d4..af10170af09b4c8f449aff94bae731777db04321 100644 (file)
--- a/gettext-runtime/m4/printf-posix.m4
+++ b/gettext-runtime/m4/printf-posix.m4
@@ -1,10 +1,8 @@
 # printf-posix.m4 serial 2 (gettext-0.13.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.
 
 dnl From Bruno Haible.
 dnl Test whether the printf() function supports POSIX/XSI format strings with

diff --git a/gettext-runtime/m4/progtest.m4 b/gettext-runtime/m4/progtest.m4
index 346482d51c62e9d8b543766011006331a14a1885..a56365cd37f9c9ddd6ff65378615b34619c59375 100644 (file)
--- a/gettext-runtime/m4/progtest.m4
+++ b/gettext-runtime/m4/progtest.m4
@@ -1,10 +1,8 @@
 # progtest.m4 serial 4 (gettext-0.14.2)
 dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free 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
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public

diff --git a/gettext-runtime/m4/signed.m4 b/gettext-runtime/m4/signed.m4
index dc1f54f1069c0e1b71b85dc13af9f17177bf2eb2..048f593698ba151c8c47f25b90df5c87c54e8aa0 100644 (file)
--- a/gettext-runtime/m4/signed.m4
+++ b/gettext-runtime/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/gettext-runtime/m4/size_max.m4 b/gettext-runtime/m4/size_max.m4
index 5762fc333c5d6838256fcd27813faada414fe3fa..4fe81c7b0720b4ac3e0c0f05966732ec8e9a47d4 100644 (file)
--- a/gettext-runtime/m4/size_max.m4
+++ b/gettext-runtime/m4/size_max.m4
@@ -1,10 +1,8 @@
 # size_max.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.
 
 dnl From Bruno Haible.
 

diff --git a/gettext-runtime/m4/stdint_h.m4 b/gettext-runtime/m4/stdint_h.m4
index 063c4344e3c31ef60946237129616e288dbda6f0..3355f35aa3ffef364fc812923db663ff1564292a 100644 (file)
--- a/gettext-runtime/m4/stdint_h.m4
+++ b/gettext-runtime/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/gettext-runtime/m4/uintmax_t.m4 b/gettext-runtime/m4/uintmax_t.m4
index a2bc218ce79592e7f6128fc99a9004182242364d..bf83ed7464ff34359400f2a52f3abb8b780b0551 100644 (file)
--- a/gettext-runtime/m4/uintmax_t.m4
+++ b/gettext-runtime/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/gettext-runtime/m4/ulonglong.m4 b/gettext-runtime/m4/ulonglong.m4
index 1123ccb8372c6b7f4fce80b51c8e53b723bd23a7..dee10ccc3ee641a63153f7b29ae2339c1e56c723 100644 (file)
--- a/gettext-runtime/m4/ulonglong.m4
+++ b/gettext-runtime/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/gettext-runtime/m4/wchar_t.m4 b/gettext-runtime/m4/wchar_t.m4
index d8fd1ec5c3b30d0147f1794e8cfb1f36dc874f15..cde2129a97273cfbab4ad5adc811ec34dfd5d59e 100644 (file)
--- a/gettext-runtime/m4/wchar_t.m4
+++ b/gettext-runtime/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/gettext-runtime/m4/wint_t.m4 b/gettext-runtime/m4/wint_t.m4
index 3d8d21594c0e1c020424f9c24edad66231f6bc59..b8fff9c86fdbda95e007a0406fab3a8b1293d89e 100644 (file)
--- a/gettext-runtime/m4/wint_t.m4
+++ b/gettext-runtime/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.

diff --git a/gettext-runtime/m4/xsize.m4 b/gettext-runtime/m4/xsize.m4
index 7bf1865b456b3eadc31fcabfad29affe7ca7f2a1..85bb721e43e854f923d96ea65ba070ac9100c8c4 100644 (file)
--- a/gettext-runtime/m4/xsize.m4
+++ b/gettext-runtime/m4/xsize.m4
@@ -1,10 +1,8 @@
 # xsize.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_XSIZE],
 [