summaryrefslogtreecommitdiffstats
path: root/gettext-tools/m4
diff options
context:
space:
mode:
Diffstat (limited to 'gettext-tools/m4')
-rw-r--r--gettext-tools/m4/ChangeLog15
-rw-r--r--gettext-tools/m4/Makefile.in95
-rw-r--r--gettext-tools/m4/alloca.m48
-rw-r--r--gettext-tools/m4/allocsa.m48
-rw-r--r--gettext-tools/m4/backupfile.m48
-rw-r--r--gettext-tools/m4/canonicalize.m48
-rw-r--r--gettext-tools/m4/csharp.m48
-rw-r--r--gettext-tools/m4/csharpcomp.m48
-rw-r--r--gettext-tools/m4/csharpexec.m48
-rw-r--r--gettext-tools/m4/eaccess.m48
-rw-r--r--gettext-tools/m4/eealloc.m48
-rw-r--r--gettext-tools/m4/error.m48
-rw-r--r--gettext-tools/m4/exitfail.m48
-rw-r--r--gettext-tools/m4/extensions.m411
-rw-r--r--gettext-tools/m4/fnmatch.m420
-rw-r--r--gettext-tools/m4/gcj.m48
-rw-r--r--gettext-tools/m4/getline.m49
-rw-r--r--gettext-tools/m4/getndelim2.m48
-rw-r--r--gettext-tools/m4/getopt.m48
-rw-r--r--gettext-tools/m4/hard-locale.m48
-rw-r--r--gettext-tools/m4/hostname.m48
-rw-r--r--gettext-tools/m4/javacomp.m48
-rw-r--r--gettext-tools/m4/javaexec.m48
-rw-r--r--gettext-tools/m4/libgrep.m48
-rw-r--r--gettext-tools/m4/locale-fr.m48
-rw-r--r--gettext-tools/m4/mbrtowc.m48
-rw-r--r--gettext-tools/m4/mbstate_t.m48
-rw-r--r--gettext-tools/m4/mbswidth.m48
-rw-r--r--gettext-tools/m4/memchr.m48
-rw-r--r--gettext-tools/m4/mkdtemp.m48
-rw-r--r--gettext-tools/m4/onceonly.m48
-rw-r--r--gettext-tools/m4/pathmax.m48
-rw-r--r--gettext-tools/m4/quote.m48
-rw-r--r--gettext-tools/m4/quotearg.m48
-rw-r--r--gettext-tools/m4/readlink.m48
-rw-r--r--gettext-tools/m4/relocatable.m48
-rw-r--r--gettext-tools/m4/restrict.m48
-rw-r--r--gettext-tools/m4/setenv.m48
-rw-r--r--gettext-tools/m4/setlocale.m48
-rw-r--r--gettext-tools/m4/sig_atomic_t.m48
-rw-r--r--gettext-tools/m4/siginfo.m48
-rw-r--r--gettext-tools/m4/signalblocking.m48
-rw-r--r--gettext-tools/m4/ssize_t.m48
-rw-r--r--gettext-tools/m4/stdbool.m420
-rw-r--r--gettext-tools/m4/stpncpy.m48
-rw-r--r--gettext-tools/m4/strcase.m48
-rw-r--r--gettext-tools/m4/strdup.m48
-rw-r--r--gettext-tools/m4/strerror.m48
-rw-r--r--gettext-tools/m4/strerror_r.m419
-rw-r--r--gettext-tools/m4/tmpdir.m48
-rw-r--r--gettext-tools/m4/unionwait.m48
-rw-r--r--gettext-tools/m4/unlocked-io.m421
-rw-r--r--gettext-tools/m4/xreadlink.m48
53 files changed, 239 insertions, 331 deletions
diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 463d302..cd0728c 100644
--- 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 1ac80d8..67b4551 100644
--- 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 4df039d..8c20443 100644
--- 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 9ec0024..474862f 100644
--- 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 78f15cc..54c73ef 100644
--- 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 7dba0b4..19df1db 100644
--- 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 748750e..a9c5489 100644
--- 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 132cc49..fc6edcc 100644
--- 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 1aa8613..999c8e1 100644
--- 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 fab2cb4..58dba2b 100644
--- 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 aca0df9..adcfd06 100644
--- 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 6c10918..ed1e6d5 100644
--- 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 fa5b149..a1761f9 100644
--- 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 58bc0be..d6e9fd9 100644
--- 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 92a8f2b..deba45c 100644
--- 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 af16707..2e2eded 100644
--- 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 606a989..8676923 100644
--- 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 6715c53..ac539c6 100644
--- 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 dcd333b..b50dfa4 100644
--- 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 6ce7cc1..631cf74 100644
--- 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 cca598d..50756f3 100644
--- 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 f41be60..a180647 100644
--- 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 27ed7db..f15c13b 100644
--- 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 e82bc63..492d55b 100644
--- 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 0371b2f..6fcb67d 100644
--- 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 3d8768e..2eee1a6 100644
--- 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 a07f51b..df2a275 100644
--- 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 ffa6ece..878e531 100644
--- 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 0ae7ff1..c02ace8 100644
--- 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 f64fe11..e02c825 100644
--- 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 50b33f4..a8a992a 100644
--- 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 95ab044..4e403bd 100644
--- 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 14ce1b6..3c2fdc2 100644
--- 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 877fcd9..dfe6dfc 100644
--- 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 ec53e14..b4a7f55 100644
--- 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 430fcb5..a089221 100644
--- 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 c840778..0f47bb6 100644
--- 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 88d5e4c..4c76be1 100644
--- 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 5380efa..d8e536d 100644
--- 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 fc5808f..a05a73b 100644
--- 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 f8d0e74..424fcfe 100644
--- 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 1a88f52..fe91f29 100644
--- 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 56b7ea4..19b379f 100644
--- 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 b25b7d2..3f6b4bf 100644
--- 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 74b807c..8efd1a9 100644
--- 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 3fd25d0..40ace46 100644
--- 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 9964d15..570fa7c 100644
--- 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 d9aca1b..7c7ec09 100644
--- 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 bd28635..6c6cd7f 100644
--- 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 968a4cb..0eec735 100644
--- 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 106ff42..30a97ef 100644
--- 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 5849e4a..75e4d6c 100644
--- 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 5d8e47f..4e27571 100644
--- 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],
[