Use an all-permissive copyright notice.

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 463d30294b0527a37d82840a362158a7efafe27a..cd0728cf2e8cec1ae64c4a6c67f7008a7791a2c5 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,18 @@
+2005-01-19  Bruno Haible  <bruno@clisp.org>
+
+       * alloca.m4, allocsa.m4, backupfile.m4, canonicalize.m4, csharpcomp.m4:
+       * csharpexec.m4, csharp.m4, eaccess.m4, eealloc.m4, error.m4:
+       * exitfail.m4, extensions.m4, fnmatch.m4, gcj.m4, getline.m4:
+       * getndelim2.m4, getopt.m4, hard-locale.m4, hostname.m4, javacomp.m4:
+       * javaexec.m4, libgrep.m4, locale-fr.m4, mbrtowc.m4, mbstate_t.m4:
+       * mbswidth.m4, memchr.m4, mkdtemp.m4, onceonly.m4, pathmax.m4:
+       * quotearg.m4, quote.m4, readlink.m4, relocatable.m4, restrict.m4:
+       * setenv.m4, setlocale.m4, sig_atomic_t.m4, siginfo.m4:
+       * signalblocking.m4, ssize_t.m4, stdbool.m4, stpncpy.m4, strcase.m4:
+       * strdup.m4, strerror.m4, strerror_r.m4, tmpdir.m4, unionwait.m4:
+       * unlocked-io.m4, xreadlink.m4:
+       Use an all-permissive copyright notice, recommended by RMS.
+
 2005-01-14  Bruno Haible  <bruno@clisp.org>
 
        * stpncpy.m4 (gl_FUNC_STPNCPY): Rename the replacement function to

diff --git a/gettext-tools/m4/Makefile.in b/gettext-tools/m4/Makefile.in
index 1ac80d839114792d431c68259001eef1c24a3b3f..67b4551fe1e4bfa0255cbf9b7075a57f60d66687 100644 (file)
--- a/gettext-tools/m4/Makefile.in
+++ b/gettext-tools/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,
@@ -36,6 +36,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 \
@@ -49,6 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/m4/fixautomake.m4 \
        $(top_srcdir)/../gettext-runtime/m4/ansi-c++.m4 \
        $(top_srcdir)/../gettext-runtime/m4/codeset.m4 \
        $(top_srcdir)/../gettext-runtime/m4/gettext.m4 \
+       $(top_srcdir)/../gettext-runtime/m4/glibc2.m4 \
        $(top_srcdir)/../gettext-runtime/m4/glibc21.m4 \
        $(top_srcdir)/../gettext-runtime/m4/iconv.m4 \
        $(top_srcdir)/../gettext-runtime/m4/intdiv0.m4 \
@@ -76,19 +78,25 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/m4/fixautomake.m4 \
        $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \
        $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \
        $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \
-       $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/extensions.m4 \
-       $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/gcj.m4 \
-       $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getndelim2.m4 \
-       $(top_srcdir)/m4/hostname.m4 $(top_srcdir)/m4/javacomp.m4 \
-       $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/locale-fr.m4 \
+       $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exitfail.m4 \
+       $(top_srcdir)/m4/extensions.m4 $(top_srcdir)/m4/fnmatch.m4 \
+       $(top_srcdir)/m4/gcj.m4 $(top_srcdir)/m4/getline.m4 \
+       $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \
+       $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostname.m4 \
+       $(top_srcdir)/m4/javacomp.m4 $(top_srcdir)/m4/javaexec.m4 \
+       $(top_srcdir)/m4/libgrep.m4 $(top_srcdir)/m4/locale-fr.m4 \
        $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \
-       $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/mkdtemp.m4 \
-       $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \
-       $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/relocatable.m4 \
-       $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \
-       $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \
-       $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \
-       $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/strerror.m4 \
+       $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/memchr.m4 \
+       $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/onceonly.m4 \
+       $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/quote.m4 \
+       $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readlink.m4 \
+       $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/setenv.m4 \
+       $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \
+       $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/m4/signalblocking.m4 \
+       $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
+       $(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strcase.m4 \
+       $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \
        $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \
        $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/xreadlink.m4 \
        $(top_srcdir)/configure.ac
@@ -99,7 +107,14 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-am__installdirs = $(DESTDIR)$(aclocaldir) $(DESTDIR)$(examplesconfigdir)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(aclocaldir)" \
+       "$(DESTDIR)$(examplesconfigdir)"
 aclocalDATA_INSTALL = $(INSTALL_DATA)
 examplesconfigDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(aclocal_DATA) $(examplesconfig_DATA)
@@ -154,6 +169,8 @@ FNMATCH_H = @FNMATCH_H@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 GENCAT = @GENCAT@
+GETOPT_H = @GETOPT_H@
+GLIBC2 = @GLIBC2@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
@@ -196,11 +213,13 @@ INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LDFLAGS = @INTL_MACOSX_LDFLAGS@
 JAR = @JAR@
 JAVA = @JAVA@
 JAVAC = @JAVAC@
 LDFLAGS = @LDFLAGS@
 LIBEXPAT = @LIBEXPAT@
+LIBGREPOBJS = @LIBGREPOBJS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
@@ -264,6 +283,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@
@@ -303,6 +324,7 @@ aclocal_DATA = \
   ../../autoconf-lib-link/m4/lib-prefix.m4 \
   ../../gettext-runtime/m4/codeset.m4 \
   ../../gettext-runtime/m4/gettext.m4 \
+  ../../gettext-runtime/m4/glibc2.m4 \
   ../../gettext-runtime/m4/glibc21.m4 \
   ../../gettext-runtime/m4/iconv.m4 \
   ../../gettext-runtime/m4/intdiv0.m4 \
@@ -346,11 +368,14 @@ csharpexec.m4 \
 eaccess.m4 \
 eealloc.m4 \
 error.m4 \
+exitfail.m4 \
 extensions.m4 \
 fnmatch.m4 \
 gcj.m4 \
 getline.m4 \
 getndelim2.m4 \
+getopt.m4 \
+hard-locale.m4 \
 hostname.m4 \
 javacomp.m4 \
 javaexec.m4 \
@@ -358,11 +383,16 @@ locale-fr.m4 \
 mbrtowc.m4 \
 mbstate_t.m4 \
 mbswidth.m4 \
+memchr.m4 \
 mkdtemp.m4 \
 onceonly.m4 \
 pathmax.m4 \
+quote.m4 \
+quotearg.m4 \
 readlink.m4 \
+regex.m4 \
 relocatable.m4 \
+restrict.m4 \
 setenv.m4 \
 setlocale.m4 \
 sig_atomic_t.m4 \
@@ -370,6 +400,9 @@ siginfo.m4 \
 signalblocking.m4 \
 ssize_t.m4 \
 stdbool.m4 \
+stpncpy.m4 \
+strcase.m4 \
+strdup.m4 \
 strerror.m4 \
 strerror_r.m4 \
 tmpdir.m4 \
@@ -421,37 +454,37 @@ distclean-libtool:
 uninstall-info-am:
 install-aclocalDATA: $(aclocal_DATA)
        @$(NORMAL_INSTALL)
-       $(mkdir_p) $(DESTDIR)$(aclocaldir)
+       test -z "$(aclocaldir)" || $(mkdir_p) "$(DESTDIR)$(aclocaldir)"
        @list='$(aclocal_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " $(aclocalDATA_INSTALL) $$d$$p $(DESTDIR)$(aclocaldir)/$$f"; \
-         $(aclocalDATA_INSTALL) $$d$$p $(DESTDIR)$(aclocaldir)/$$f; \
+         f=$(am__strip_dir) \
+         echo " $(aclocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(aclocaldir)/$$f'"; \
+         $(aclocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(aclocaldir)/$$f"; \
        done
 
 uninstall-aclocalDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(aclocal_DATA)'; for p in $$list; do \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " rm -f $(DESTDIR)$(aclocaldir)/$$f"; \
-         rm -f $(DESTDIR)$(aclocaldir)/$$f; \
+         f=$(am__strip_dir) \
+         echo " rm -f '$(DESTDIR)$(aclocaldir)/$$f'"; \
+         rm -f "$(DESTDIR)$(aclocaldir)/$$f"; \
        done
 install-examplesconfigDATA: $(examplesconfig_DATA)
        @$(NORMAL_INSTALL)
-       $(mkdir_p) $(DESTDIR)$(examplesconfigdir)
+       test -z "$(examplesconfigdir)" || $(mkdir_p) "$(DESTDIR)$(examplesconfigdir)"
        @list='$(examplesconfig_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " $(examplesconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(examplesconfigdir)/$$f"; \
-         $(examplesconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(examplesconfigdir)/$$f; \
+         f=$(am__strip_dir) \
+         echo " $(examplesconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(examplesconfigdir)/$$f'"; \
+         $(examplesconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(examplesconfigdir)/$$f"; \
        done
 
 uninstall-examplesconfigDATA:
        @$(NORMAL_UNINSTALL)
        @list='$(examplesconfig_DATA)'; for p in $$list; do \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " rm -f $(DESTDIR)$(examplesconfigdir)/$$f"; \
-         rm -f $(DESTDIR)$(examplesconfigdir)/$$f; \
+         f=$(am__strip_dir) \
+         echo " rm -f '$(DESTDIR)$(examplesconfigdir)/$$f'"; \
+         rm -f "$(DESTDIR)$(examplesconfigdir)/$$f"; \
        done
 tags: TAGS
 TAGS:
@@ -491,7 +524,9 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-       $(mkdir_p) $(DESTDIR)$(aclocaldir) $(DESTDIR)$(examplesconfigdir)
+       for dir in "$(DESTDIR)$(aclocaldir)" "$(DESTDIR)$(examplesconfigdir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -511,7 +546,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-tools/m4/alloca.m4 b/gettext-tools/m4/alloca.m4
index 4df039d203f256dde10b87b4177aaea64e787f9e..8c204436f0509c3691b8b8fe9e0d8b5902fbc83e 100644 (file)
--- a/gettext-tools/m4/alloca.m4
+++ b/gettext-tools/m4/alloca.m4
@@ -1,10 +1,8 @@
 # alloca.m4 serial 2 (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.
 
 AC_DEFUN([gl_FUNC_ALLOCA],
 [

diff --git a/gettext-tools/m4/allocsa.m4 b/gettext-tools/m4/allocsa.m4
index 9ec0024484dc9ebfa1114f813455fb7be8fbd8b2..474862fe3a3a56c761386ee37d6f6982d944501f 100644 (file)
--- a/gettext-tools/m4/allocsa.m4
+++ b/gettext-tools/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/gettext-tools/m4/backupfile.m4 b/gettext-tools/m4/backupfile.m4
index 78f15cc01709f14d7cc09aaade88595945457f01..54c73efa5484cac9af59384ca1e509993aed8084 100644 (file)
--- a/gettext-tools/m4/backupfile.m4
+++ b/gettext-tools/m4/backupfile.m4
@@ -1,10 +1,8 @@
 # backupfile.m4 serial 2 (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.
 
 # Prerequisites of lib/backupfile.h
 

diff --git a/gettext-tools/m4/canonicalize.m4 b/gettext-tools/m4/canonicalize.m4
index 7dba0b423f7c00374fbf987c02c76c747814e793..19df1db553642dda0c7ede81d7d83333fb1961c0 100644 (file)
--- a/gettext-tools/m4/canonicalize.m4
+++ b/gettext-tools/m4/canonicalize.m4
@@ -1,10 +1,8 @@
 # canonicalize.m4 serial 2 (gettext-0.13)
 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_CANONICALIZE],
 [

diff --git a/gettext-tools/m4/csharp.m4 b/gettext-tools/m4/csharp.m4
index 748750e197fed6163279ea788b1eb7fdaf7b021a..a9c548904f9f4086bd944c75b265a34f90419b21 100644 (file)
--- a/gettext-tools/m4/csharp.m4
+++ b/gettext-tools/m4/csharp.m4
@@ -1,10 +1,8 @@
 # csharp.m4 serial 2 (gettext-0.14.2)
 dnl Copyright (C) 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.
 
 # Sets CSHARP_CHOICE to the preferred C# implementation:
 # 'pnet' or 'mono' or 'any' or 'no'.

diff --git a/gettext-tools/m4/csharpcomp.m4 b/gettext-tools/m4/csharpcomp.m4
index 132cc4987288098b17d171b034da560af3000d35..fc6edcc57522a0731365c4bd0a4ed67ccae66e6e 100644 (file)
--- a/gettext-tools/m4/csharpcomp.m4
+++ b/gettext-tools/m4/csharpcomp.m4
@@ -1,10 +1,8 @@
 # csharpcomp.m4 serial 4 (gettext-0.14.2)
 dnl Copyright (C) 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.
 
 # Prerequisites of csharpcomp.sh.
 # Sets HAVE_CSHARPCOMP to nonempty if csharpcomp.sh will work.

diff --git a/gettext-tools/m4/csharpexec.m4 b/gettext-tools/m4/csharpexec.m4
index 1aa8613ce6fb05071f853fb0cc2a52d44a94ff52..999c8e1ad7cc28b933f416bd76bb0d3fe61640ca 100644 (file)
--- a/gettext-tools/m4/csharpexec.m4
+++ b/gettext-tools/m4/csharpexec.m4
@@ -1,10 +1,8 @@
 # csharpexec.m4 serial 1 (gettext-0.14)
 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.
 
 # Prerequisites of csharpexec.sh.
 # Sets HAVE_CSHARPEXEC to nonempty if csharpexec.sh will work.

diff --git a/gettext-tools/m4/eaccess.m4 b/gettext-tools/m4/eaccess.m4
index fab2cb40bde8b01acfeb44b07a2568cf936edeae..58dba2b26b935bb8d7b54b1ca8192b84225c8ac9 100644 (file)
--- a/gettext-tools/m4/eaccess.m4
+++ b/gettext-tools/m4/eaccess.m4
@@ -1,10 +1,8 @@
 # eaccess.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.
 
 AC_DEFUN([gl_FUNC_EACCESS],
 [

diff --git a/gettext-tools/m4/eealloc.m4 b/gettext-tools/m4/eealloc.m4
index aca0df9ce5144c9a3cb04296840c8986ef9be5c3..adcfd06c958648721a0b6d30383454b09f4d5ad6 100644 (file)
--- a/gettext-tools/m4/eealloc.m4
+++ b/gettext-tools/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/gettext-tools/m4/error.m4 b/gettext-tools/m4/error.m4
index 6c1091886f50610488f1a1b0f556b29fa8c2ddb6..ed1e6d5e5b8bc3f2b2c8b6e1d98c41535cb0559c 100644 (file)
--- a/gettext-tools/m4/error.m4
+++ b/gettext-tools/m4/error.m4
@@ -1,10 +1,8 @@
 # error.m4 serial 10 (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.
 
 AC_DEFUN([gl_ERROR],
 [

diff --git a/gettext-tools/m4/exitfail.m4 b/gettext-tools/m4/exitfail.m4
index fa5b14931f3482ca54b60d73e272cdde1bbbcba1..a1761f93422c4febe138f8ac22b00cbbe7998765 100644 (file)
--- a/gettext-tools/m4/exitfail.m4
+++ b/gettext-tools/m4/exitfail.m4
@@ -1,10 +1,8 @@
 # exitfail.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_EXITFAIL],
 [

diff --git a/gettext-tools/m4/extensions.m4 b/gettext-tools/m4/extensions.m4
index 58bc0beb6d5b674c128208b3678c02e1e789adcc..d6e9fd978bb24e64b6df7c7a0b09a8ae375d70b2 100644 (file)
--- a/gettext-tools/m4/extensions.m4
+++ b/gettext-tools/m4/extensions.m4
@@ -1,12 +1,9 @@
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
-
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
+dnl Copyright (C) 2003 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.
 
 # gl_USE_SYSTEM_EXTENSIONS
 # ------------------------

diff --git a/gettext-tools/m4/fnmatch.m4 b/gettext-tools/m4/fnmatch.m4
index 92a8f2b58b79ea946e7e74cdfdac1b008ecbfc7c..deba45cdfef676965bb911ad3fa5314f07c29a8a 100644 (file)
--- a/gettext-tools/m4/fnmatch.m4
+++ b/gettext-tools/m4/fnmatch.m4
@@ -3,22 +3,10 @@
 # This is a modified version of autoconf's AC_FUNC_FNMATCH.
 # This file should be simplified after Autoconf 2.57 is required.
 
-# Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+dnl Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 # _AC_FUNC_FNMATCH_IF(STANDARD = GNU | POSIX, CACHE_VAR, IF-TRUE, IF-FALSE)
 # -------------------------------------------------------------------------

diff --git a/gettext-tools/m4/gcj.m4 b/gettext-tools/m4/gcj.m4
index af167071eb73122d3dcc2a2f476b1f969ff96cb5..2e2ededf727380547ec4e1fd0f9e97dc6d6d8344 100644 (file)
--- a/gettext-tools/m4/gcj.m4
+++ b/gettext-tools/m4/gcj.m4
@@ -1,10 +1,8 @@
 # gcj.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.
 
 # Check for a Java compiler that creates executables.
 # Assigns the variables GCJ and GCJFLAGS, and set HAVE_GCJ to nonempty,

diff --git a/gettext-tools/m4/getline.m4 b/gettext-tools/m4/getline.m4
index 606a989b950872a2623509fed9eaec0669b8e282..867692334d750da5d67c4026dc18d756f91753fe 100644 (file)
--- a/gettext-tools/m4/getline.m4
+++ b/gettext-tools/m4/getline.m4
@@ -2,12 +2,9 @@
 
 dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software
 dnl Foundation, Inc.
-
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 AC_PREREQ(2.52)
 

diff --git a/gettext-tools/m4/getndelim2.m4 b/gettext-tools/m4/getndelim2.m4
index 6715c53cd862366b1780eb07c2fd7c2723addf86..ac539c6e555e8e945b3ea828a097ed585af29b75 100644 (file)
--- a/gettext-tools/m4/getndelim2.m4
+++ b/gettext-tools/m4/getndelim2.m4
@@ -1,10 +1,8 @@
 # getndelim2.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_GETNDELIM2],
 [

diff --git a/gettext-tools/m4/getopt.m4 b/gettext-tools/m4/getopt.m4
index dcd333ba3a13bb36bd703a24400e1e3d003fa52d..b50dfa470bf87a0e78da0d0b06cc70599cbefb5f 100644 (file)
--- a/gettext-tools/m4/getopt.m4
+++ b/gettext-tools/m4/getopt.m4
@@ -1,10 +1,8 @@
 # getopt.m4 serial 6
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 # The getopt module assume you want GNU getopt, with getopt_long etc,
 # rather than vanilla POSIX getopt.  This means your your code should

diff --git a/gettext-tools/m4/hard-locale.m4 b/gettext-tools/m4/hard-locale.m4
index 6ce7cc1e539aa812634a9f5b3ae054b7f7b5eab1..631cf74823aa27b1a560f9ead9278b56811015a3 100644 (file)
--- a/gettext-tools/m4/hard-locale.m4
+++ b/gettext-tools/m4/hard-locale.m4
@@ -1,10 +1,8 @@
 # hard-locale.m4 serial 4
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl No prerequisites of lib/hard-locale.c.
 AC_DEFUN([gl_HARD_LOCALE], [:])

diff --git a/gettext-tools/m4/hostname.m4 b/gettext-tools/m4/hostname.m4
index cca598d8edeb6dd09a83ec7975ca9c9ad821de33..50756f3f160486f64ec4fcd34588873756ab9966 100644 (file)
--- a/gettext-tools/m4/hostname.m4
+++ b/gettext-tools/m4/hostname.m4
@@ -1,10 +1,8 @@
 # hostname.m4 serial 1 (gettext-0.11)
 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.
 
 # Prerequisites of the hostname.c program.
 AC_DEFUN([gt_PREREQ_HOSTNAME],

diff --git a/gettext-tools/m4/javacomp.m4 b/gettext-tools/m4/javacomp.m4
index f41be60928505e0bb2c36ad5ff00abeedeb63ac8..a180647a52ac0d3e8b584d579ba1a58cda1a0e3b 100644 (file)
--- a/gettext-tools/m4/javacomp.m4
+++ b/gettext-tools/m4/javacomp.m4
@@ -1,10 +1,8 @@
 # javacomp.m4 serial 6 (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.
 
 # Prerequisites of javacomp.sh.
 # Sets HAVE_JAVACOMP to nonempty if javacomp.sh will work.

diff --git a/gettext-tools/m4/javaexec.m4 b/gettext-tools/m4/javaexec.m4
index 27ed7db968cab69875f9487211c82b50a164315e..f15c13bf57bfbe514e3ca9fb2482ad4b97e1b9b0 100644 (file)
--- a/gettext-tools/m4/javaexec.m4
+++ b/gettext-tools/m4/javaexec.m4
@@ -1,10 +1,8 @@
 # javaexec.m4 serial 2 (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.
 
 # Prerequisites of javaexec.sh.
 # gt_JAVAEXEC or gt_JAVAEXEC(testclass, its-directory)

diff --git a/gettext-tools/m4/libgrep.m4 b/gettext-tools/m4/libgrep.m4
index e82bc63ced6a0536117da7748b6cb9f3713b075c..492d55bd7bdafe86dbeb627fb814da287501cd72 100644 (file)
--- a/gettext-tools/m4/libgrep.m4
+++ b/gettext-tools/m4/libgrep.m4
@@ -1,10 +1,8 @@
 # libgrep.m4 serial 1 (gettext-0.14.2)
 dnl Copyright (C) 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.
 
 AC_DEFUN([gt_LIBGREP],
 [

diff --git a/gettext-tools/m4/locale-fr.m4 b/gettext-tools/m4/locale-fr.m4
index 0371b2fb427c1b2ed73ac79233d18e8adf161497..6fcb67d48894025e57e5a6ab737150086debbbe2 100644 (file)
--- a/gettext-tools/m4/locale-fr.m4
+++ b/gettext-tools/m4/locale-fr.m4
@@ -1,10 +1,8 @@
 # locale-fr.m4 serial 1 (gettext-0.13)
 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-tools/m4/mbrtowc.m4 b/gettext-tools/m4/mbrtowc.m4
index 3d8768ecbec86f98a90e4014ab55d913808eb50f..2eee1a64ffe61374c4dce4bf78d21e158ecc877d 100644 (file)
--- a/gettext-tools/m4/mbrtowc.m4
+++ b/gettext-tools/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/gettext-tools/m4/mbstate_t.m4 b/gettext-tools/m4/mbstate_t.m4
index a07f51bc154b8beaccfcec07fa4c8cee0fbe39af..df2a275c2eab6a08d7d0b65fa7ee4e6ae230c7e9 100644 (file)
--- a/gettext-tools/m4/mbstate_t.m4
+++ b/gettext-tools/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/gettext-tools/m4/mbswidth.m4 b/gettext-tools/m4/mbswidth.m4
index ffa6ece3bf17d0a7b23c56a298b476bba730c722..878e5311d5a8ca62d074b54646dbe440874bc46d 100644 (file)
--- a/gettext-tools/m4/mbswidth.m4
+++ b/gettext-tools/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/gettext-tools/m4/memchr.m4 b/gettext-tools/m4/memchr.m4
index 0ae7ff11b5e27f50da40cebe41bf188bf9154b6c..c02ace8054a566638ef6a6a3851f85a04bf8dac1 100644 (file)
--- a/gettext-tools/m4/memchr.m4
+++ b/gettext-tools/m4/memchr.m4
@@ -1,10 +1,8 @@
 # memchr.m4 serial 3
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_MEMCHR],
 [

diff --git a/gettext-tools/m4/mkdtemp.m4 b/gettext-tools/m4/mkdtemp.m4
index f64fe11f62de14aaf54f8070fe1aa3ba52c8b3be..e02c8256c91c1611c458ab665a4dc26607ac60a5 100644 (file)
--- a/gettext-tools/m4/mkdtemp.m4
+++ b/gettext-tools/m4/mkdtemp.m4
@@ -1,10 +1,8 @@
 # mkdtemp.m4 serial 3
 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.
 
 AC_DEFUN([gt_FUNC_MKDTEMP],
 [

diff --git a/gettext-tools/m4/onceonly.m4 b/gettext-tools/m4/onceonly.m4
index 50b33f489fe9f86762b06d7e4af2ed6993c4d4d7..a8a992af4b84f058ac442a8dfa80ef8250a132b0 100644 (file)
--- a/gettext-tools/m4/onceonly.m4
+++ b/gettext-tools/m4/onceonly.m4
@@ -1,10 +1,8 @@
 # onceonly.m4 serial 3 (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 This file defines some "once only" variants of standard autoconf macros.
 dnl   AC_CHECK_HEADERS_ONCE         like  AC_CHECK_HEADERS

diff --git a/gettext-tools/m4/pathmax.m4 b/gettext-tools/m4/pathmax.m4
index 95ab044d841a1f8b46483842294bf48f4516ab79..4e403bd38211044fbe3e6cb8fabd2728064adb9a 100644 (file)
--- a/gettext-tools/m4/pathmax.m4
+++ b/gettext-tools/m4/pathmax.m4
@@ -1,10 +1,8 @@
 # pathmax.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_PATHMAX],
 [

diff --git a/gettext-tools/m4/quote.m4 b/gettext-tools/m4/quote.m4
index 14ce1b6198493ebe8821e0ca1f2e29bf6ef10f71..3c2fdc2ed8514abf8633e57bd09d3143d7fcd410 100644 (file)
--- a/gettext-tools/m4/quote.m4
+++ b/gettext-tools/m4/quote.m4
@@ -1,10 +1,8 @@
 # quote.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_QUOTE],
 [

diff --git a/gettext-tools/m4/quotearg.m4 b/gettext-tools/m4/quotearg.m4
index 877fcd9af1c91b822487eb8274b19e3c99304447..dfe6dfc809ab21492414474741a093712332fb17 100644 (file)
--- a/gettext-tools/m4/quotearg.m4
+++ b/gettext-tools/m4/quotearg.m4
@@ -1,10 +1,8 @@
 # quotearg.m4 serial 2
 dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_QUOTEARG],
 [

diff --git a/gettext-tools/m4/readlink.m4 b/gettext-tools/m4/readlink.m4
index ec53e14db86a6316fab7be3c1d6d94c40d07b43d..b4a7f55d7ab3a6f6418c64666be4286d611e71c0 100644 (file)
--- a/gettext-tools/m4/readlink.m4
+++ b/gettext-tools/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/gettext-tools/m4/relocatable.m4 b/gettext-tools/m4/relocatable.m4
index 430fcb57dba44e8364e5538884b8aa1ded602418..a08922143dd1bfd513bf720233315fba2396a807 100644 (file)
--- a/gettext-tools/m4/relocatable.m4
+++ b/gettext-tools/m4/relocatable.m4
@@ -1,10 +1,8 @@
 # relocatable.m4 serial 2 (gettext-0.13)
 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-tools/m4/restrict.m4 b/gettext-tools/m4/restrict.m4
index c8407782d5daca53f2712d26615b954307296790..0f47bb6309ae4eb97ea15e9ee8953e1cac8b4f62 100644 (file)
--- a/gettext-tools/m4/restrict.m4
+++ b/gettext-tools/m4/restrict.m4
@@ -1,10 +1,8 @@
 #serial 1002
 dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 # This macro can be removed once we can rely on Autoconf 2.57a or later,
 # since we can then use its AC_C_RESTRICT.

diff --git a/gettext-tools/m4/setenv.m4 b/gettext-tools/m4/setenv.m4
index 88d5e4c206697ed9bf98e040edfd603ec2213bf7..4c76be1ff61c29415119dc63f2feeb95d5fd6962 100644 (file)
--- a/gettext-tools/m4/setenv.m4
+++ b/gettext-tools/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/gettext-tools/m4/setlocale.m4 b/gettext-tools/m4/setlocale.m4
index 5380efa8d173e833aa0e81450120d5de3d1eaf8f..d8e536d7010fd67190ae984413760437d06b643e 100644 (file)
--- a/gettext-tools/m4/setlocale.m4
+++ b/gettext-tools/m4/setlocale.m4
@@ -1,10 +1,8 @@
 # setlocale.m4 serial 2 (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.
 
 # Check for setlocale declaration.
 

diff --git a/gettext-tools/m4/sig_atomic_t.m4 b/gettext-tools/m4/sig_atomic_t.m4
index fc5808fad46e59b20cb6af01fed1fc5bfbac72c7..a05a73be777312ecbb86db64dd0d61b97e8fab88 100644 (file)
--- a/gettext-tools/m4/sig_atomic_t.m4
+++ b/gettext-tools/m4/sig_atomic_t.m4
@@ -1,10 +1,8 @@
 # sig_atomic_t.m4 serial 1 (gettext-0.13)
 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([gt_TYPE_SIG_ATOMIC_T],
 [

diff --git a/gettext-tools/m4/siginfo.m4 b/gettext-tools/m4/siginfo.m4
index f8d0e7496a17c55821b1fd9ddc4b4b85d51b5755..424fcfee2d82b20af66898bd82bada76a91a3553 100644 (file)
--- a/gettext-tools/m4/siginfo.m4
+++ b/gettext-tools/m4/siginfo.m4
@@ -1,10 +1,8 @@
 # siginfo.m4 serial 1 (gettext-0.11)
 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.
 
 # Determine how to determine the precise cause of a signal, for example
 # division by zero.

diff --git a/gettext-tools/m4/signalblocking.m4 b/gettext-tools/m4/signalblocking.m4
index 1a88f52fd6f06bc3d5c67adc8b3c6e7a18c39925..fe91f29846ac744a9ac6126a506e093c869e59ab 100644 (file)
--- a/gettext-tools/m4/signalblocking.m4
+++ b/gettext-tools/m4/signalblocking.m4
@@ -1,10 +1,8 @@
 # signalblocking.m4 serial 1 (gettext-0.11)
 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.
 
 # Determine available signal blocking primitives. Three different APIs exist:
 # 1) POSIX: sigemptyset, sigaddset, sigprocmask

diff --git a/gettext-tools/m4/ssize_t.m4 b/gettext-tools/m4/ssize_t.m4
index 56b7ea43367c75907cc01df3d452fe4a82001b71..19b379fee4bc4ac06ab0412c386b3c692444ecc6 100644 (file)
--- a/gettext-tools/m4/ssize_t.m4
+++ b/gettext-tools/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/gettext-tools/m4/stdbool.m4 b/gettext-tools/m4/stdbool.m4
index b25b7d2440b8c970f5d657d3c902ce3a4a9eaf4b..3f6b4bfcbf44e62ca8d34aa42aa8c1bf7632679f 100644 (file)
--- a/gettext-tools/m4/stdbool.m4
+++ b/gettext-tools/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/gettext-tools/m4/stpncpy.m4 b/gettext-tools/m4/stpncpy.m4
index 74b807cb043c06501f51e0e3fae8b97e64c78a29..8efd1a9c32ca571d320d370bc7b23ff5a75401aa 100644 (file)
--- a/gettext-tools/m4/stpncpy.m4
+++ b/gettext-tools/m4/stpncpy.m4
@@ -1,10 +1,8 @@
 # stpncpy.m4 serial 2
 dnl Copyright (C) 2002-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.
 
 AC_DEFUN([gl_FUNC_STPNCPY],
 [

diff --git a/gettext-tools/m4/strcase.m4 b/gettext-tools/m4/strcase.m4
index 3fd25d0ce970ee81db08d3a3210c3f0bf555a3b0..40ace46a727698616220d4794ad1b1ec8ab714d5 100644 (file)
--- a/gettext-tools/m4/strcase.m4
+++ b/gettext-tools/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/gettext-tools/m4/strdup.m4 b/gettext-tools/m4/strdup.m4
index 9964d15b1078dd061c09437d98daf5aa2156cf04..570fa7c86e69d9937ef862e46e6fb41ec5fa896e 100644 (file)
--- a/gettext-tools/m4/strdup.m4
+++ b/gettext-tools/m4/strdup.m4
@@ -1,10 +1,8 @@
 # strdup.m4 serial 4
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRDUP],
 [

diff --git a/gettext-tools/m4/strerror.m4 b/gettext-tools/m4/strerror.m4
index d9aca1bb0123a62d98fc5be68472ee1f57091109..7c7ec095abb4f3895b216033fffe577e921f5cd2 100644 (file)
--- a/gettext-tools/m4/strerror.m4
+++ b/gettext-tools/m4/strerror.m4
@@ -1,10 +1,8 @@
 # strerror.m4 serial 1 (gettext-0.12)
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRERROR],
 [

diff --git a/gettext-tools/m4/strerror_r.m4 b/gettext-tools/m4/strerror_r.m4
index bd28635281b71548fed738e6de7dcc05fb8c8099..6c6cd7f3f76f5477c35a2ee1ec779c1ca94217cb 100644 (file)
--- a/gettext-tools/m4/strerror_r.m4
+++ b/gettext-tools/m4/strerror_r.m4
@@ -2,21 +2,10 @@
 # Experimental replacement for the function in the latest CVS autoconf.
 # Use with the error.c file in ../lib.
 
-# Copyright 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+dnl Copyright 2001 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.
 
 undefine([AC_FUNC_STRERROR_R])
 

diff --git a/gettext-tools/m4/tmpdir.m4 b/gettext-tools/m4/tmpdir.m4
index 968a4cb394373fb97e22d857882c8dde4bfa03d6..0eec7357d14eed71d1d9cbbbc4e0b7b56c3c282d 100644 (file)
--- a/gettext-tools/m4/tmpdir.m4
+++ b/gettext-tools/m4/tmpdir.m4
@@ -1,10 +1,8 @@
 # tmpdir.m4 serial 1 (gettext-0.11)
 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.
 
 # Prerequisites for lib/tmpdir.c
 

diff --git a/gettext-tools/m4/unionwait.m4 b/gettext-tools/m4/unionwait.m4
index 106ff42c0140798738b36944c1024fd90b6b85d7..30a97efdb4ff7e91561a81468f006e2c07914469 100644 (file)
--- a/gettext-tools/m4/unionwait.m4
+++ b/gettext-tools/m4/unionwait.m4
@@ -1,10 +1,8 @@
 # unionwait.m4 serial 1 (gettext-0.11)
 dnl Copyright (C) 1993-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 Taken from GNU make 3.79.1.
 

diff --git a/gettext-tools/m4/unlocked-io.m4 b/gettext-tools/m4/unlocked-io.m4
index 5849e4a3ae0f1769ffcb6e1ee95f3a1736039ee5..75e4d6cd6e8b9ee93af4ae5df251f6670a176206 100644 (file)
--- a/gettext-tools/m4/unlocked-io.m4
+++ b/gettext-tools/m4/unlocked-io.m4
@@ -1,21 +1,10 @@
 # unlocked-io.m4 serial 10
 
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-# Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+dnl 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

diff --git a/gettext-tools/m4/xreadlink.m4 b/gettext-tools/m4/xreadlink.m4
index 5d8e47f92e0c3373d14f7eb17a2d22ffa8cc2fcb..4e27571dbc8e01bc8211708f9d5b236c71856c2a 100644 (file)
--- a/gettext-tools/m4/xreadlink.m4
+++ b/gettext-tools/m4/xreadlink.m4
@@ -1,10 +1,8 @@
 # xreadlink.m4 serial 4
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_XREADLINK],
 [