autoconf-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Ralf Wildenhues
Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63b-50-g35e67f5
Date: Tue, 02 Jun 2009 18:28:47 +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=35e67f5c0d5e002ce91ffed734bb6f8db1eceb45

The branch, master has been updated
       via  35e67f5c0d5e002ce91ffed734bb6f8db1eceb45 (commit)
       via  6382b687fdd3c4955ff3ee30e618efc228e0c9d4 (commit)
       via  6928fc64b2c29effab05cacbe4c1b17caa938cc9 (commit)
       via  e86cec418e63889eb3ab726adf14547b6639df30 (commit)
       via  b29a07fffb68cb6915e7bc89360718acec112ade (commit)
       via  83d976a33f322ffb164433db6aa3bb6f78e40333 (commit)
       via  780a068d297868cf3dd617ef12676cbfc3a05862 (commit)
       via  80e62691c97560f27fcafc8e08aaf2e9f75cfabc (commit)
       via  b26d51caf989d23748e4d32ecb938ce838902b74 (commit)
      from  3bec0c1d32f56cfec6a9c78ddbed658b03863ae6 (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 35e67f5c0d5e002ce91ffed734bb6f8db1eceb45
Author: Ralf Wildenhues <address@hidden>
Date:   Thu May 21 14:18:39 2009 +0200

    Document VPATH = $(variable) issue in VPATH chapter.
    
    * doc/autoconf.texi (Variables listed in VPATH): New node.
    (Top, VPATH and Make): Adjust menus.
    (Build Directories): Refer to it.
    Prompted by report from Bruno Haible.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 6382b687fdd3c4955ff3ee30e618efc228e0c9d4
Author: Eric Blake <address@hidden>
Date:   Mon May 4 09:41:41 2009 -0600

    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.
    * BUGS: Relicense under all-permissive license.
    * HACKING: Likewise.
    * NEWS: Likewise.
    * README: Likewise.
    * README-alpha: Likewise.
    * README-hacking: Likewise.
    * TODO: Likewise.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 6928fc64b2c29effab05cacbe4c1b17caa938cc9
Author: Eric Blake <address@hidden>
Date:   Mon May 4 09:41:04 2009 -0600

    Update some upstream files.
    
    * build-aux/config.guess: Resynchronize from upstream.
    * build-aux/gnupload: Likewise.
    * build-aux/vc-list-files: Likewise.
    * build-aux/texinfo.tex: Likewise.
    * doc/gendocs_template: Likewise.
    
    Signed-off-by: Eric Blake <address@hidden>

commit e86cec418e63889eb3ab726adf14547b6639df30
Author: Eric Blake <address@hidden>
Date:   Tue May 19 10:45:08 2009 -0600

    Don't mention undocumented interface in NEWS.
    
    * NEWS: Correct earlier entry about AS_FOR.
    
    Signed-off-by: Eric Blake <address@hidden>

commit b29a07fffb68cb6915e7bc89360718acec112ade
Author: Ralf Wildenhues <address@hidden>
Date:   Sun May 17 11:49:44 2009 +0200

    New manual section `Parallel Make'.
    
    * doc/autoconf.texi (Parallel Make): New node, document NetBSD
    `make -jN' quirks.
    (Top, Portable Make): Adjust menus.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 83d976a33f322ffb164433db6aa3bb6f78e40333
Author: Ralf Wildenhues <address@hidden>
Date:   Thu May 14 07:20:58 2009 +0200

    testsuite: skip `Multiple languages' test without C++ compiler.
    
    * tests/compile.at (Multiple languages): Skip test on systems
    without a C++ compiler.
    Report by Jim Meyering.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 780a068d297868cf3dd617ef12676cbfc3a05862
Author: Eric Blake <address@hidden>
Date:   Mon May 4 10:30:16 2009 -0600

    Document zsh bug with empty commands.
    
    * doc/autoconf.texi (Special Shell Variables) <?>: Add mention of
    more problems with $?.

commit 80e62691c97560f27fcafc8e08aaf2e9f75cfabc
Author: Patrick Welche <address@hidden>
Date:   Mon May 11 20:34:09 2009 +0200

    Also try X11R7 when looking for X11 files, for NetBSD.
    
    * lib/autoconf/libs.m4 (_AC_PATH_X_DIRECT): Also try directories
    with X11R7 in the name.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit b26d51caf989d23748e4d32ecb938ce838902b74
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Apr 27 21:38:40 2009 +0200

    Limit stderr logging for C compiler version.
    
    * lib/autoconf/general.m4 (_AC_RUN_LOG_LIMIT, _AC_DO_LIMIT): New
    internal macros, equivalent to _AC_RUN_LOG and _AC_DO, but with
    an optional additional argument to limit the number of lines of
    stderr output logged, defaulting to 10.
    * lib/autoconf/c.m4 (AC_PROG_CC, AC_PROG_CXX, AC_PROG_OBJC): Use
    _AC_DO_LIMIT for capturing compiler version output.  Also test
    -qversion, for the IBM xlc compiler.
    * lib/autoconf/fortran.m4 (_AC_PROG_FC): Likewise.
    * THANKS: Update.
    Report by Christian Rössel and John R. Cary against Libtool.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 BUGS                    |   17 ++------
 ChangeLog               |   96 ++++++++++++++++++++++++++++++++++++++++++-
 ChangeLog.0             |   16 ++++++-
 ChangeLog.1             |   16 ++++++-
 ChangeLog.2             |   16 ++++++-
 HACKING                 |   16 ++-----
 NEWS                    |   41 ++++++++-----------
 README                  |   16 ++-----
 README-alpha            |   19 +++------
 README-hacking          |   18 ++------
 THANKS                  |   20 ++++++---
 TODO                    |   20 +++------
 build-aux/config.guess  |    5 ++-
 build-aux/gnupload      |    7 ++-
 build-aux/texinfo.tex   |   10 ++--
 build-aux/vc-list-files |   15 +++++-
 doc/autoconf.texi       |  103 +++++++++++++++++++++++++++++++++++++++++++++-
 doc/gendocs_template    |    8 +--
 doc/install.texi        |    6 ++-
 lib/autoconf/c.m4       |   18 ++++----
 lib/autoconf/fortran.m4 |    6 +-
 lib/autoconf/general.m4 |   29 +++++++++++++
 lib/autoconf/libs.m4    |    4 ++
 m4/m4.m4                |   14 ++++--
 m4/make-case.m4         |   13 ++++--
 tests/compile.at        |   22 +++++++++-
 tests/statesave.m4      |   20 +++++++--
 27 files changed, 422 insertions(+), 169 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
-       it under the terms of the GNU General Public License as published by
-       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 0c243ca..73fc483 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,83 @@
+2009-05-21  Ralf Wildenhues  <address@hidden>
+
+       Document VPATH = $(variable) issue in VPATH chapter.
+       * doc/autoconf.texi (Variables listed in VPATH): New node.
+       (Top, VPATH and Make): Adjust menus.
+       (Build Directories): Refer to it.
+       Prompted by report from Bruno Haible.
+
+2009-05-19  Eric Blake  <address@hidden>
+
+       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.
+       * BUGS: Relicense under all-permissive license.
+       * HACKING: Likewise.
+       * NEWS: Likewise.
+       * README: Likewise.
+       * README-alpha: Likewise.
+       * README-hacking: Likewise.
+       * TODO: Likewise.
+
+       Update some upstream files.
+       * build-aux/config.guess: Resynchronize from upstream.
+       * build-aux/gnupload: Likewise.
+       * 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.
+
+2009-05-17  Ralf Wildenhues  <address@hidden>
+
+       New manual section `Parallel Make'.
+       * doc/autoconf.texi (Parallel Make): New node, document NetBSD
+       `make -jN' quirks.
+       (Top, Portable Make): Adjust menus.
+
+2009-05-14  Ralf Wildenhues  <address@hidden>
+
+       testsuite: skip `Multiple languages' test without C++ compiler.
+       * tests/compile.at (Multiple languages): Skip test on systems
+       without a C++ compiler.
+       Report by Jim Meyering.
+
+2009-05-13  Eric Blake  <address@hidden>
+
+       Document zsh bug with empty commands.
+       * doc/autoconf.texi (Special Shell Variables) <?>: Add mention of
+       more problems with $?.
+
+2009-05-11  Patrick Welche  <address@hidden>  (tiny change)
+
+       Also try X11R7 when looking for X11 files, for NetBSD.
+       * lib/autoconf/libs.m4 (_AC_PATH_X_DIRECT): Also try directories
+       with X11R7 in the name.
+
+2009-05-01  Ralf Wildenhues  <address@hidden>
+
+       Limit stderr logging for C compiler version.
+       * lib/autoconf/general.m4 (_AC_RUN_LOG_LIMIT, _AC_DO_LIMIT): New
+       internal macros, equivalent to _AC_RUN_LOG and _AC_DO, but with
+       an optional additional argument to limit the number of lines of
+       stderr output logged, defaulting to 10.
+       * lib/autoconf/c.m4 (AC_PROG_CC, AC_PROG_CXX, AC_PROG_OBJC): Use
+       _AC_DO_LIMIT for capturing compiler version output.  Also test
+       -qversion, for the IBM xlc compiler.
+       * lib/autoconf/fortran.m4 (_AC_PROG_FC): Likewise.
+       * THANKS: Update.
+       Report by Christian Rössel and John R. Cary against Libtool.
+
 2009-04-24  Eric Blake  <address@hidden>
 
        Fix quoting of m4 macros in AT_CHECK.
@@ -19380,6 +19460,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
+       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/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  
(address@hidden)
 
        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
+       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/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  
(address@hidden)
 
        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
+       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/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  
(address@hidden)
        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
+       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/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
-it under the terms of the GNU General Public License as published by
-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
   argument.  Instead of
 
-        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
-it under the terms of the GNU General Public License as published by
-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
diff --git a/README b/README
index 593ee86..5524941 100644
--- a/README
+++ b/README
@@ -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
-it under the terms of the GNU General Public License as published by
-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/README-alpha b/README-alpha
index c0b9337..dea7deb 100644
--- a/README-alpha
+++ b/README-alpha
@@ -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
-it under the terms of the GNU General Public License as published by
-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/README-hacking b/README-hacking
index 5d84404..6eb8c44 100644
--- a/README-hacking
+++ b/README-hacking
@@ -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
-it under the terms of the GNU General Public License as published by
-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 77da1dd..8bf999a 100644
--- a/THANKS
+++ b/THANKS
@@ -72,6 +72,7 @@ Chris Torek                 address@hidden
 Christian Cornelssen        address@hidden
 Christian Krackowizer       address@hidden
 Christian Krone             address@hidden
+Christian Rössel            address@hidden
 Christopher Hulbert         address@hidden
 Christopher Lee             address@hidden
 Clinton Roy                 address@hidden
@@ -179,6 +180,7 @@ John Calcote                address@hidden
 John David Anglin           address@hidden
 John Fortin                 address@hidden
 John Interrante             address@hidden
+John R. Cary                address@hidden
 John W. Eaton               address@hidden
 Jonathan Kamens             address@hidden
 Josef Tran                  address@hidden
@@ -388,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
-any later version published by the Free Software Foundation; with no
-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
+it under the terms of the GNU General Public License as published by
+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
-it under the terms of the GNU General Public License as published by
-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
 # under the terms of the GNU General Public License as published by
@@ -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-solaris2`echo ${UNAME_RELEASE}|sed -e 
's/[^.]*//'`
+       exit ;;
     sun4H:SunOS:5.*:*)
        echo sparc-hal-solaris2`echo ${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\copyright{copyright}%
-  \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/autoconf.texi b/doc/autoconf.texi
index a4bb429..a26b1b7 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -509,6 +509,7 @@ Portable Make Programming
 * Macros and Submakes::         @code{make macro=value} and submakes
 * The Make Macro MAKEFLAGS::    @code{$(MAKEFLAGS)} portability issues
 * The Make Macro SHELL::        @code{$(SHELL)} portability issues
+* Parallel Make::               Parallel @command{make} quirks
 * Comments in Make Rules::      Other problems with Make comments
 * obj/ and Make::               Don't name a subdirectory @file{obj}
 * make -k Status::              Exit status of @samp{make -k}
@@ -518,6 +519,7 @@ Portable Make Programming
 
 @code{VPATH} and Make
 
+* Variables listed in VPATH::   @code{VPATH} must be literal on ancient hosts
 * VPATH and Double-colon::      Problems with @samp{::} on ancient hosts
 * $< in Explicit Rules::        @code{$<} does not work in ordinary rules
 * Automatic Rule Rewriting::    @code{VPATH} goes wild on Solaris
@@ -2952,9 +2954,8 @@ srcdir = @@srcdir@@
 VPATH = @@srcdir@@
 @end example
 
-Do not set @code{VPATH} to the value of another variable, for example
address@hidden = $(srcdir)}, because some versions of @command{make} do not do
-variable substitutions on the value of @code{VPATH}.
+Do not set @code{VPATH} to the value of another variable (@pxref{Variables
+listed in VPATH}.
 
 @command{configure} substitutes the correct value for @code{srcdir} when
 it produces @file{Makefile}.
@@ -14925,6 +14926,20 @@ underscores.
 
 @c Alphabetical order, case insensitive, `A' before `a'.
 @table @code
address@hidden ?
+Not all shells correctly reset @samp{$?} after conditionals (@pxref{if,
+, Limitations of Shell Builtins}).  Not all shells manage @samp{$?}
+correctly in shell functions (@pxref{Shell Functions}) or in traps
+(@pxref{trap, , Limitations of Shell Builtins}).  Not all shells reset
address@hidden to zero after an empty command.
+
address@hidden
+$ @kbd{bash -c 'false; $empty; echo $?'}
+0
+$ @kbd{zsh -c 'false; $empty; echo $?'}
+1
address@hidden example
+
 @item _
 Many shells reserve @samp{$_} for various purposes, e.g., the name of
 the last command executed.
@@ -15850,6 +15865,7 @@ word splitting on @address@hidden"$@@"@}}; see 
@ref{Shell Substitutions},
 item @samp{$@@}, for more.
 
 
address@hidden
 @item @command{if}
 @c ---------------
 @prindex @command{if}
@@ -17552,6 +17568,7 @@ itself.
 * Macros and Submakes::         @code{make macro=value} and submakes
 * The Make Macro MAKEFLAGS::    @code{$(MAKEFLAGS)} portability issues
 * The Make Macro SHELL::        @code{$(SHELL)} portability issues
+* Parallel Make::               Parallel @command{make} quirks
 * Comments in Make Rules::      Other problems with Make comments
 * obj/ and Make::               Don't name a subdirectory @file{obj}
 * make -k Status::              Exit status of @samp{make -k}
@@ -17863,6 +17880,66 @@ $ @kbd{env SHELL=sh gmake -e SHELL=/bin/ksh}  # GNU 
make 3.81
 sh
 @end example
 
address@hidden Parallel Make
address@hidden Parallel Make
address@hidden Parallel @command{make}
+
+Support for parallel execution in @command{make} implementation varies.
+Generally, using @acronym{GNU} make is your best bet.  When NetBSD
address@hidden is invoked with @address@hidden, it will reuse the
+same shell for multiple commands within one recipe.  This can have
+unexpected address@hidden that @acronym{GNU} make has
+heuristics to avoid spawning a shell at all if the command is deemed
+safe to be executed directly.} For example, change of directories or
+variables persist between commands:
+
address@hidden
+all:
+        @@var=value; cd /; pwd; echo $$var; echo $$$$
+        @@pwd; echo $$var; echo $$$$
address@hidden example
+
address@hidden
+may output the following with @code{make -j1}:
+
address@hidden
+--- all ---
+/
+value
+32235
+/
+value
+32235
address@hidden example
+
+while without @option{-j1}, or with @option{-B}, the output looks less
+surprising:
+
address@hidden
+/
+value
+32238
+/tmp
+
+32239
address@hidden example
+
+Another consequence of this is that, if one command in a recipe uses
address@hidden 0} to indicate a successful exit, the shell will be gone
+and the remaining commands of this recipe will not be executed.
+
+The above example also shows additional status output NetBSD
address@hidden produces in parallel mode for targets being updated.
+
+Furthermore, parallel NetBSD @command{make} will route standard error
+from commands that it spawns into its own standard output, and may
+remove leading whitespace from output lines.
+
+You can avoid these issues by using the @option{-B} option to enable
+compatibility semantics.  However, that will effectively also disable
+all parallelism as that will cause prerequisites to be updated in the
+order they are listed in a rule.
+
 @node Comments in Make Rules
 @section Comments in Make Rules
 @cindex Comments in @file{Makefile} rules
@@ -17951,6 +18028,7 @@ Here are some known issues with some @code{VPATH}
 implementations.
 
 @menu
+* Variables listed in VPATH::   @code{VPATH} must be literal on ancient hosts
 * VPATH and Double-colon::      Problems with @samp{::} on ancient hosts
 * $< in Explicit Rules::        @code{$<} does not work in ordinary rules
 * Automatic Rule Rewriting::    @code{VPATH} goes wild on Solaris
@@ -17958,6 +18036,25 @@ implementations.
 * Make Target Lookup::          More details about @code{VPATH} lookup
 @end menu
 
address@hidden Variables listed in VPATH
address@hidden Variables listed in @code{VPATH}
address@hidden @code{VPATH} and variables
address@hidden variables and @code{VPATH}
+
+Do not set @code{VPATH} to the value of another variable, for example
address@hidden = $(srcdir)}, because some ancient versions of
address@hidden do not do variable substitutions on the value of
address@hidden  For example, use this
+
address@hidden
+srcdir = @@srcdir@@
+VPATH = @@srcdir@@
address@hidden example
+
address@hidden
+rather than @samp{VPATH = $(srcdir)}.  Note that with @acronym{GNU}
+Automake, there is no need to set this yourself.
+
 @node VPATH and Double-colon
 @subsection @code{VPATH} and Double-colon Rules
 @cindex @code{VPATH} and double-colon rules
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
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
+the FSF.<br />
 Please send broken links and other corrections or suggestions to
-<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 @@
 Copyright @copyright{} 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004,
 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/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 3fa9c04..ffdbd45 100644
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -471,9 +471,9 @@ test -z "$CC" && AC_MSG_FAILURE([no acceptable C compiler 
found in \$PATH])
 _AS_ECHO_LOG([checking for _AC_LANG compiler version])
 set X $ac_compile
 ac_compiler=$[2]
-_AC_DO([$ac_compiler --version >&AS_MESSAGE_LOG_FD])
-_AC_DO([$ac_compiler -v >&AS_MESSAGE_LOG_FD])
-_AC_DO([$ac_compiler -V >&AS_MESSAGE_LOG_FD])
+for ac_option in --version -v -V -qversion; do
+  _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
+done
 
 m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
 m4_expand_once([_AC_COMPILER_OBJEXT])[]dnl
@@ -706,9 +706,9 @@ fi
 _AS_ECHO_LOG([checking for _AC_LANG compiler version])
 set X $ac_compile
 ac_compiler=$[2]
-_AC_DO([$ac_compiler --version >&AS_MESSAGE_LOG_FD])
-_AC_DO([$ac_compiler -v >&AS_MESSAGE_LOG_FD])
-_AC_DO([$ac_compiler -V >&AS_MESSAGE_LOG_FD])
+for ac_option in --version -v -V -qversion; do
+  _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
+done
 
 m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
 m4_expand_once([_AC_COMPILER_OBJEXT])[]dnl
@@ -876,9 +876,9 @@ AC_CHECK_TOOLS(OBJC,
 _AS_ECHO_LOG([checking for _AC_LANG compiler version])
 set X $ac_compile
 ac_compiler=$[2]
-_AC_DO([$ac_compiler --version >&AS_MESSAGE_LOG_FD])
-_AC_DO([$ac_compiler -v >&AS_MESSAGE_LOG_FD])
-_AC_DO([$ac_compiler -V >&AS_MESSAGE_LOG_FD])
+for ac_option in --version -v -V -qversion; do
+  _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
+done
 
 m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
 m4_expand_once([_AC_COMPILER_OBJEXT])[]dnl
diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index f144c0e..dcffe58 100644
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -354,9 +354,9 @@ AC_CHECK_TOOLS([]_AC_FC[],
 _AS_ECHO_LOG([checking for _AC_LANG compiler version])
 set X $ac_compile
 ac_compiler=$[2]
-_AC_DO([$ac_compiler --version >&AS_MESSAGE_LOG_FD])
-_AC_DO([$ac_compiler -v >&AS_MESSAGE_LOG_FD])
-_AC_DO([$ac_compiler -V >&AS_MESSAGE_LOG_FD])
+for ac_option in --version -v -V -qversion; do
+  _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
+done
 rm -f a.out
 
 m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 83254ed..9eaae80 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2311,6 +2311,26 @@ AC_DEFUN([_AC_RUN_LOG_STDERR],
   _AS_ECHO_LOG([\$? = $ac_status])
   test $ac_status = 0; }])
 
+
+# _AC_RUN_LOG_LIMIT(COMMAND, LOG-COMMANDS, [LINES])
+# -------------------------------------------------
+# Like _AC_RUN_LOG, but only log LINES lines from stderr,
+# defaulting to 10 lines.
+AC_DEFUN([_AC_RUN_LOG_LIMIT],
+[{ { $2; } >&AS_MESSAGE_LOG_FD
+  ($1) 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed 'm4_default([$3], [10])a\
+... rest of stderr output deleted ...
+         m4_default([$3], [10])q' conftest.err >conftest.er1
+    cat conftest.er1 >&AS_MESSAGE_LOG_FD
+    rm -f conftest.er1 conftest.err
+  fi
+  _AS_ECHO_LOG([\$? = $ac_status])
+  test $ac_status = 0; }])
+
+
 # _AC_DO_ECHO(COMMAND)
 # --------------------
 # Echo COMMAND.  This is designed to be used just before evaluating COMMAND.
@@ -2372,6 +2392,15 @@ AC_DEFUN([_AC_DO_TOKENS],
   _AC_DO([$ac_try]); }])
 
 
+# _AC_DO_LIMIT(COMMAND, [LINES])
+# ------------------------------
+# Like _AC_DO, but limit the amount of stderr lines logged to LINES.
+# For internal use only.
+AC_DEFUN([_AC_DO_LIMIT],
+[_AC_RUN_LOG_LIMIT([eval "$1"],
+                  [_AC_DO_ECHO([$1])], [$2])])
+
+
 # _AC_EVAL(COMMAND)
 # -----------------
 # Eval COMMAND, save the exit status in ac_status, and log it.
diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4
index cbc4218..8f7729b 100644
--- a/lib/autoconf/libs.m4
+++ b/lib/autoconf/libs.m4
@@ -236,21 +236,25 @@ m4_define([_AC_PATH_X_DIRECT],
 # Check X11 before X11Rn because it is often a symlink to the current release.
 ac_x_header_dirs='
 /usr/X11/include
+/usr/X11R7/include
 /usr/X11R6/include
 /usr/X11R5/include
 /usr/X11R4/include
 
 /usr/include/X11
+/usr/include/X11R7
 /usr/include/X11R6
 /usr/include/X11R5
 /usr/include/X11R4
 
 /usr/local/X11/include
+/usr/local/X11R7/include
 /usr/local/X11R6/include
 /usr/local/X11R5/include
 /usr/local/X11R4/include
 
 /usr/local/include/X11
+/usr/local/include/X11R7
 /usr/local/include/X11R6
 /usr/local/include/X11R5
 /usr/local/include/X11R4
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/compile.at b/tests/compile.at
index 6ca4ef4..20398fb 100644
--- a/tests/compile.at
+++ b/tests/compile.at
@@ -2,8 +2,8 @@
 
 AT_BANNER([Low level compiling/preprocessing macros.])
 
-# Copyright (C) 2000, 2001, 2003, 2005, 2006, 2007, 2008 Free Software
-# Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003, 2005, 2006, 2007, 2008, 2009  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
@@ -219,6 +219,24 @@ AC_COMPILE_IFELSE([
 AT_CHECK_AUTOCONF
 AT_CHECK_CONFIGURE
 
+# This test should be skipped on systems without a C++ compiler.
+AT_DATA([configure.ac],
+[[AC_INIT
+
+AC_PROG_CXX
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([
+  AC_LANG_PROGRAM([[
+    #ifndef __cplusplus
+    choke me
+    #endif
+  ]])], [], AS_EXIT([77]))
+AC_LANG_POP([C++])
+]])
+
+AT_CHECK_AUTOCONF
+AT_CHECK_CONFIGURE
+
 AT_DATA([configure.ac],
 [[AC_INIT
 
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
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # AC_STATE_SAVE(FILE)
 # -------------------


hooks/post-receive
-- 
GNU Autoconf source repository




reply via email to

[Prev in Thread] Current Thread [Next in Thread]