autoconf-commit
[Top][All Lists]

## [SCM] GNU Autoconf source repository branch, master, updated. v2.63b-49-

 From: Eric Blake Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63b-49-g6382b68 Date: Wed, 20 May 2009 12:15:10 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=6382b687fdd3c4955ff3ee30e618efc228e0c9d4

The branch, master has been updated
via  6382b687fdd3c4955ff3ee30e618efc228e0c9d4 (commit)
via  6928fc64b2c29effab05cacbe4c1b17caa938cc9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6382b687fdd3c4955ff3ee30e618efc228e0c9d4
Date:   Mon May 4 09:41:41 2009 -0600

* ChangeLog.0: Likewise.
* ChangeLog.1: Likewise.
* ChangeLog.2: Likewise.
* THANKS: Likewise.
* m4/m4.m4: Use latest wording of FSF all-permissive license.
* m4/make-case.m4: Likewise.
* doc/install.texi: Likewise.
* tests/statesave.m4: Relicense to match rest of testsuite; this
file does not need all-permissive license since it is not designed
for reuse by other packages.
* HACKING: Likewise.
* NEWS: Likewise.
* TODO: Likewise.

commit 6928fc64b2c29effab05cacbe4c1b17caa938cc9
Date:   Mon May 4 09:41:04 2009 -0600

Update some upstream files.

* build-aux/config.guess: Resynchronize from upstream.
* build-aux/vc-list-files: Likewise.
* build-aux/texinfo.tex: Likewise.
* doc/gendocs_template: Likewise.

Date:   Tue May 19 10:45:08 2009 -0600

Don't mention undocumented interface in NEWS.

* NEWS: Correct earlier entry about AS_FOR.

-----------------------------------------------------------------------

Summary of changes:
BUGS                    |   17 +++------------
ChangeLog               |   48 ++++++++++++++++++++++++++++++++++++++++++++--
ChangeLog.0             |   16 ++++++++++++--
ChangeLog.1             |   16 ++++++++++++--
ChangeLog.2             |   16 ++++++++++++--
HACKING                 |   16 +++-----------
NEWS                    |   41 ++++++++++++++++-----------------------
THANKS                  |   18 +++++++++++-----
TODO                    |   20 +++++-------------
build-aux/config.guess  |    5 +++-
build-aux/texinfo.tex   |   10 ++++----
build-aux/vc-list-files |   15 +++++++++++--
doc/gendocs_template    |    8 ++----
doc/install.texi        |    6 +++-
m4/m4.m4                |   14 ++++++++----
m4/make-case.m4         |   13 +++++++----
tests/statesave.m4      |   20 +++++++++++++++---
21 files changed, 207 insertions(+), 152 deletions(-)

diff --git a/BUGS b/BUGS
index 1d32e50..64d8cba 100644
--- a/BUGS
+++ b/BUGS
@@ -5,19 +5,10 @@ file before using Autoconf, and especially git versions of
Autoconf.

Copyright (C) 2000-2002, 2006-2009 Free Software Foundation, Inc.

-       This program is free software: you can redistribute it and/or modify
-       the Free Software Foundation, either version 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-
+       Copying and distribution of this file, with or without
+       modification, are permitted in any medium without royalty provided
+       the copyright notice and this notice are preserved.  This file is
+       offered as-is, without warranty of any kind.

Autoconf must not be used in production if there are Serious'' bugs,
and use with caution an Autoconf with Important bugs''.
diff --git a/ChangeLog b/ChangeLog
index 331f2de..64058cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+
+       Update uses of all-permissive license.
+       * ChangeLog: Relicense under GPL.
+       * ChangeLog.0: Likewise.
+       * ChangeLog.1: Likewise.
+       * ChangeLog.2: Likewise.
+       * THANKS: Likewise.
+       * m4/m4.m4: Use latest wording of FSF all-permissive license.
+       * m4/make-case.m4: Likewise.
+       * doc/install.texi: Likewise.
+       * tests/statesave.m4: Relicense to match rest of testsuite; this
+       file does not need all-permissive license since it is not designed
+       for reuse by other packages.
+       * HACKING: Likewise.
+       * NEWS: Likewise.
+       * TODO: Likewise.
+
+       Update some upstream files.
+       * build-aux/config.guess: Resynchronize from upstream.
+       * build-aux/vc-list-files: Likewise.
+       * build-aux/texinfo.tex: Likewise.
+       * doc/gendocs_template: Likewise.
+
+       Don't mention undocumented interface in NEWS.
+       * NEWS: Correct earlier entry about AS_FOR.
+

New manual section Parallel Make'.
@@ -19420,6 +19452,16 @@
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
Free Software Foundation, Inc.

-       Copying and distribution of this file, with or without
-       modification, are permitted provided the copyright notice and this
-       notice are preserved.
+       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 3 of the
+
+       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, see
diff --git a/ChangeLog.0 b/ChangeLog.0
index df72216..b46523f 100644
--- a/ChangeLog.0
+++ b/ChangeLog.0
@@ -347,6 +347,16 @@ Fri Apr 24 10:08:21 1992  David J. MacKenzie

Copyright (C) 1992 Free Software Foundation, Inc.

-       Copying and distribution of this file, with or without
-       modification, are permitted provided the copyright notice and this
-       notice are preserved.
+       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 3 of the
+
+       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, see
diff --git a/ChangeLog.1 b/ChangeLog.1
index 0282dcd..a28662b 100644
--- a/ChangeLog.1
+++ b/ChangeLog.1
@@ -1924,6 +1924,16 @@ Mon Jul 20 01:08:01 1992  David J. MacKenzie

Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.

-       Copying and distribution of this file, with or without
-       modification, are permitted provided the copyright notice and this
-       notice are preserved.
+       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 3 of the
+
+       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, see
diff --git a/ChangeLog.2 b/ChangeLog.2
index 13624cd..1f4560b 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -12853,6 +12853,16 @@ Thu Apr 28 12:01:01 1994  David J. MacKenzie
Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free
Software Foundation, Inc.

-       Copying and distribution of this file, with or without
-       modification, are permitted provided the copyright notice and this
-       notice are preserved.
+       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 3 of the
+
+       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, see
diff --git a/HACKING b/HACKING
index 42a31bf..9cab4ac 100644
--- a/HACKING
+++ b/HACKING
@@ -172,15 +172,7 @@ that needs to be updated.

Copyright (C) 2002, 2008, 2009 Free Software Foundation, Inc.

-This program is free software: you can redistribute it and/or modify
-the Free Software Foundation, either version 3 of the License, 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, see <http://www.gnu.org/licenses/>.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/NEWS b/NEWS
index 11466d6..9626cac 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,8 @@ GNU Autoconf NEWS - User visible changes.
* Major changes in Autoconf 2.64 (2009-??-??) [stable]
Released by Eric Blake, based on git versions 2.63b.*.

-** AS_IF, AS_CASE, and AS_FOR have been taught to avoid syntax errors
-   even when given arguments that expand to just whitespace.
+** AS_IF and AS_CASE have been taught to avoid syntax errors even when
+   given arguments that expand to just whitespace.

** Ensure AT_CHECK can support commands that include a # given with
proper m4 quoting.  For shell comments, this is a new feature; for
@@ -806,8 +806,8 @@ One packaging problem fixed (config/install-sh was not
executable).

Release tips:

-           Have your configure.ac checked by autoscan ("autoscan").
-             Try the warning options ("autoreconf -fv -Wall").
+          Have your configure.ac checked by autoscan ("autoscan").
+            Try the warning options ("autoreconf -fv -Wall").

** Documentation

@@ -870,8 +870,8 @@ Release tips:
avoid useless backslashes-- because Libtool 1.4.3 contains a

AC_DEFINE([error_t], [int],
-            [Define to a type to use for \error_t' if it is not
-             otherwise available.])
+           [Define to a type to use for \error_t' if it is not
+            otherwise available.])

We have to quote the single quotes and backslashes with \.  The old
compatibility scheme saw that  was backslashed, and therefore did
@@ -1370,14 +1370,14 @@ test cases in this new framework.
They now obey sh: you should no longer use shell variables as

-        test "$package_foo_enabled" = yes &&$my_subdirs="$my_subdirs foo" - AC_CONFIG_SUBDIRS($my_subdirs)
+       test "$package_foo_enabled" = yes &&$my_subdirs="$my_subdirs foo" + AC_CONFIG_SUBDIRS($my_subdirs)

write

-        if test "$package_foo_enabled" = yes; then - AC_CONFIG_SUBDIRS(foo) - fi + if test "$package_foo_enabled" = yes; then
+         AC_CONFIG_SUBDIRS(foo)
+       fi

- AC_HELP_STRING
To format an Autoconf macro's help string so that it looks pretty
@@ -1867,20 +1867,13 @@ Various bug fixes.
-----

Copyright (C) 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+Inc.

-This program is free software: you can redistribute it and/or modify
-the Free Software Foundation, either version 3 of the License, 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, see <http://www.gnu.org/licenses/>.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.

Local Variables:
mode: outline
index 593ee86..5524941 100644
@@ -64,15 +64,7 @@ For more licensing information, see
Copyright (C) 1992, 1993, 1994, 1998, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.

-This program is free software: you can redistribute it and/or modify
-the Free Software Foundation, either version 3 of the License, 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, see <http://www.gnu.org/licenses/>.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
index c0b9337..dea7deb 100644
@@ -22,17 +22,10 @@ users.

-----

-Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2009 Free Software Foundation,
+Inc.

-This program is free software: you can redistribute it and/or modify
-the Free Software Foundation, either version 3 of the License, 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, see <http://www.gnu.org/licenses/>.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
index 5d84404..6eb8c44 100644
@@ -126,17 +126,9 @@ Enjoy!

-----

-Copyright (C) 2002-2008 Free Software Foundation, Inc.
+Copyright (C) 2002-2009 Free Software Foundation, Inc.

-This program is free software: you can redistribute it and/or modify
-the Free Software Foundation, either version 3 of the License, 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, see <http://www.gnu.org/licenses/>.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/THANKS b/THANKS
index da6da7e..8bf999a 100644
--- a/THANKS
+++ b/THANKS
@@ -390,9 +390,15 @@ End:
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
2008, 2009 Free Software Foundation, Inc.

-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
-Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-Texts.  A copy of the license is included in the GNU Free
-Documentation License'' file as part of this distribution.
+This program is free software: you can redistribute it and/or modify
+the Free Software Foundation, either version 3 of the License, 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, see <http://www.gnu.org/licenses/>.
diff --git a/TODO b/TODO
index f85ba54..133df88 100644
--- a/TODO
+++ b/TODO
@@ -592,18 +592,10 @@ with autoconf scripts.

------------------------------------------------------------------------------

-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2007, 2008
-Free Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2007, 2008,
+2009 Free Software Foundation, Inc.

-This program is free software: you can redistribute it and/or modify
-the Free Software Foundation, either version 3 of the License, 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, see <http://www.gnu.org/licenses/>.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 3eda297..da83314 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -4,7 +4,7 @@
#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
#   Free Software Foundation, Inc.

-timestamp='2009-02-03'
+timestamp='2009-04-27'

# This file is free software; you can redistribute it and/or modify it
@@ -324,6 +324,9 @@ case
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
case /usr/bin/uname -p in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
+    s390x:SunOS:*:*)
+       echo ${UNAME_MACHINE}-ibm-solaris2echo${UNAME_RELEASE}|sed -e
's/[^.]*//'
+       exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2echo ${UNAME_RELEASE}|sed -e 's/[^.]*//' exit ;; diff --git a/build-aux/gnupload b/build-aux/gnupload index 7c34784..8320b58 100755 --- a/build-aux/gnupload +++ b/build-aux/gnupload @@ -1,13 +1,13 @@ #!/bin/sh # Sign files and upload them. -scriptversion=2009-03-05.20 +scriptversion=2009-04-28.21; # UTC # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation # # 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 3, or (at your option) +# 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, @@ -407,5 +407,6 @@ exit 0 # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
index 23a30bc..0d3ba16 100644
--- a/build-aux/texinfo.tex
+++ b/build-aux/texinfo.tex
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2009-03-28.05}
+\def\texinfoversion{2009-05-16.16}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4396,20 +4396,19 @@ end
\def\bullet{bullet}%
\def\comma{,}%
-  \def\registeredsymbol{R}%
\def\dots{...}%
\def\enddots{...}%
\def\equiv{==}%
\def\error{error}%
\def\euro{euro}%
+  \def\expansion{==>}%
\def\guillemetleft{<<}%
\def\guillemetright{>>}%
\def\guilsinglleft{<}%
\def\guilsinglright{>}%
-  \def\expansion{==>}%
\def\minus{-}%
-  \def\pounds{pounds}%
\def\point{.}%
+  \def\pounds{pounds}%
\def\print{-|}%
\def\quotedblbase{"}%
\def\quotedblleft{"}%
@@ -4417,8 +4416,9 @@ end
\def\quoteleft{}%
\def\quoteright{'}%
\def\quotesinglbase{,}%
+  \def\registeredsymbol{R}%
\def\result{=>}%
-  \def\textdegree{degrees}%
+  \def\textdegree{o}%
%
% We need to get rid of all macros, leaving only the arguments (if present).
% Of course this is not nearly correct, but it is the best we can do for now.
diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files
index 56acd5f..9376e3d 100755
--- a/build-aux/vc-list-files
+++ b/build-aux/vc-list-files
@@ -2,7 +2,7 @@
# List version-controlled file names.

# Print a version string.
-scriptversion=2009-03-01.09
+scriptversion=2009-04-25.13; # UTC

# Copyright (C) 2006-2009 Free Software Foundation, Inc.

@@ -72,7 +72,15 @@ esac
test "x$dir" = x && dir=. if test -d .git; then - eval exec git ls-files '"$dir"' $postprocess + test "x$dir" = x. \
+    && dir= sed_esc= \
+    || dir="$dir/" sed_esc=echo "$dir"|sed 's,$$[\\/]$$,\\\\\1,g'
+  # Ignore git symlinks - either they point into the tree, in which case
+  # we don't need to visit the target twice, or they point somewhere
+  # else (often into a submodule), in which case the content does not
+  # belong to this package.
+  eval exec git ls-tree -r 'HEAD:"$dir"' \ + \| sed -n '"s/^100[^ ]*./$sed_esc/p"' $postprocess elif test -d .hg; then eval exec hg locate '"$dir/*"' $postprocess elif test -d .bzr; then @@ -103,5 +111,6 @@ fi # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/doc/gendocs_template b/doc/gendocs_template
index 1bb1a5c..ee6a5c5 100644
--- a/doc/gendocs_template
+++ b/doc/gendocs_template
@@ -78,12 +78,11 @@ script</a>.)</p>

<p>
Please send FSF &amp; GNU inquiries to
There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
+the FSF.<br />
-<a href="mailto:%%EMAIL%%";><em>%%EMAIL%%</em></a>.
+<a href="mailto:%%EMAIL%%";>&lt;%%EMAIL%%&gt;</a>.
</p>

<p>Copyright &copy; 2009 Free Software Foundation, Inc.</p>
@@ -91,7 +90,6 @@ Please send broken links and other corrections or suggestions
to
<p>Verbatim copying and distribution of this entire article is
permitted in any medium, provided this notice is preserved.</p>

-
</div>
</div>
</body>
diff --git a/doc/install.texi b/doc/install.texi
index a51882c..3fc4298 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -9,8 +9,10 @@
2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.

-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+Copying and distribution of this file, with or without modification, are
+permitted in any medium without royalty provided the copyright notice
+and this notice are preserved.  This file is offered as-is, without
+warranty of any kind.

@end ifclear

diff --git a/m4/m4.m4 b/m4/m4.m4
index f27d8c0..dd90cca 100644
--- a/m4/m4.m4
+++ b/m4/m4.m4
@@ -1,8 +1,12 @@
-# m4.m4 serial 5
-dnl Copyright (C) 2000, 2006, 2007, 2008 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.
+# m4.m4 serial 6
+
+# Copyright (C) 2000, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without warranty of any kind.

# AC_PROG_GNU_M4
# --------------
diff --git a/m4/make-case.m4 b/m4/make-case.m4
index b23ccf9..717e6de 100644
--- a/m4/make-case.m4
+++ b/m4/make-case.m4
@@ -1,8 +1,11 @@
-# make-case.m4 serial 0
-dnl Copyright (C) 2008 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.
+# make-case.m4 serial 1
+
+# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the notice and
+# this notice are preserved.  This file is offered as-is, without
+# warranty of any kind.

# AC_PROG_MAKE_CASE_SENSITIVE
# ---------------------------
diff --git a/tests/statesave.m4 b/tests/statesave.m4
index 30cedc2..83f05e9 100644
--- a/tests/statesave.m4
+++ b/tests/statesave.m4
@@ -1,10 +1,22 @@
-# statesave.m4 serial 1
+# statesave.m4 serial 2

# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
# 2009 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+
+# This program is free software: you can redistribute it and/or modify
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.

# AC_STATE_SAVE(FILE)
# -------------------

`