Merge branch 'master' into pr-msvc-supportpr-msvc-support

28 files changed, 353 insertions, 230 deletions

diff --git a/AUTHORS b/AUTHORS
index ccd280ab..b8107615 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,3 +28,24 @@
     Peter Rosin			peda@lysator.liu.se
     Noah Misch			noah@cs.caltech.edu
     Charles Wilson		libtool@cwilson.fastmail.fm
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+GNU Libtool 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 of
+the License, or (at your option) any later version.
+
+GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+can be downloaded from  http://www.gnu.org/licenses/gpl.html,
+or obtained by writing to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/ChangeLog b/ChangeLog
index f1a58fa7..a1bc4653 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,72 @@
+2010-06-09  Gary V. Vaughan  <gary@gnu.org>
+
+	Fix a quoting bug with ./commit -a 'A U Thor'.
+	* clcommit.m4sh (func_commit): Use func_show_eval when calling
+	git, so that the previously func_quote_for_eval()ed $git_flags is
+	expanded properly.
+
+2009-09-15  Peter Rosin  <peda@lysator.liu.se>
+
+	Don't try the MSYS libdir path on MinGW.
+	* libltdl/ltdl.c (parse_dotla_file) [mingw]: The absolute
+	libdir path in the .la file is recorded as an MSYS (POSIX
+	style) path. Make sure it isn't tried when locating the
+	shared library.
+	* NEWS: Updated.
+
+2010-06-09  Gary V. Vaughan  <gary@gnu.org>
+
+	Simplify license variations, and add missing license texts.
+	* ChangeLog, ChangeLog.1996, ChangeLog.1997, ChangeLog.1998,
+	ChangeLog.1999, ChangeLog.2000, ChangeLog.2001, ChangeLog.2002,
+	ChangeLog.2003, ChangeLog.2004, ChangeLog.2005, ChangeLog.2006,
+	ChangeLog.2007, ChangeLog.2008, ChangeLog.2009, NEWS: Add
+	all-permissive license.
+	* HACKING, README, README.alpha, TODO: Relax license to RMS
+	encouraged all-permissive terms.
+	* libltdl/README: Ditto. I added the original license text in
+	2007, and there's no need for it to be so long for such a trivial
+	file.
+	* libltdl/config/getopt.m4sh, libltdl/general.m4sh: Cvs-utils is
+	dead, and I am the author of these files, so consolidated license
+	terms to match regular Libtool licensing.
+	* HACKING (Licensing Rules): Update wording, and list of files for
+	the all permissive license.
+	(GPL with CVS-Utils exception clause): Removed.  No files have these 
+	license any more.
+	(GPL with Libtool exception clause): Ditto, only libltdl/README
+	used to be distributed with this variation.
+	* AUTHORS: Add GPL license text.
+	
+	Fix a type in the 2.2.8 release notes.
+	* NEWS: s/ romoted/ promoted/ in the 2.2.8 release notes.
+
+	Don't warn about the blank line inserted into git commit message.
+	* clcommit.m4sh: When searching for accidental commits of mutliple
+	changes, ignore the second line of the message, which we inserted
+	earlier to support "git log --oneline".
+
+	Enable correct extraction of multiline copyright from --version.
+	* libltdl/config/getopt.m4sh: Wrap copyright notice at 76
+	columns.
+	(func_version): Don't omit spaces when merging multiline copyright
+	notices.
+	* clcommit.m4sh, libtoolize.m4sh: Wrap copyright notice at 76
+	columns.
+
+	* NEWS (2.2.8): BlueGene compiler tests were performed on BG/P
+	systems, not BG/L.
+	Reported by Christian Rössel <christian.roessel@gmx.de>
+
 2010-06-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Fix testsuite helper macros to not hide failure.
+	* tests/testsuite.at (LT_AT_CONFIGURE, LT_AT_MAKE):
+	Do not wrap AT_CHECK in a subshell, so that failures are
+	properly propagated; instead, move environment changes inside
+	the AT_CHECK code.
+	Report and analysis by Peter Rosin.
+
 	Avoid autom4te warning about unnamed diversion.
 	* libltdl/config/getopt.m4sh: Use diversion name KILL not -1.
 
@@ -422,5 +489,15 @@
 	* libtoolize.m4sh: Likewise.
 
 Continued in ChangeLog.2009
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+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.
 
 vim:tw=72
diff --git a/ChangeLog.1996 b/ChangeLog.1996
index 7b5391ca..ae9bee82 100644
--- a/ChangeLog.1996
+++ b/ChangeLog.1996
@@ -166,3 +166,13 @@
 1996-03-15  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
 
 	* For historical reasons: this is when I started writing libtool.
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+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/ChangeLog.1997 b/ChangeLog.1997
index b4e735f8..992b1bad 100644
--- a/ChangeLog.1997
+++ b/ChangeLog.1997
@@ -1312,3 +1312,13 @@
 	recognizes valid source file suffices.
 
 Continued in ChangeLog.1996
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+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/ChangeLog.1998 b/ChangeLog.1998
index 6eff1752..ca655240 100644
--- a/ChangeLog.1998
+++ b/ChangeLog.1998
@@ -1332,3 +1332,13 @@ Thu May 28 18:59:08 1998  Ian Lance Taylor  <ian@cygnus.com>
 	warnings.  Reported by François Pinard.
 
 Continued in ChangeLog.1997
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+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/ChangeLog.1999 b/ChangeLog.1999
index 27674ac8..ccabba9e 100644
--- a/ChangeLog.1999
+++ b/ChangeLog.1999
@@ -3493,3 +3493,13 @@
 	* libltdl/ltdl.h: use dllimport/export on Win32
 
 Continued in ChangeLog.1998
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+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/ChangeLog.2000 b/ChangeLog.2000
index 99fd69b0..364716b5 100644
--- a/ChangeLog.2000
+++ b/ChangeLog.2000
@@ -1315,3 +1315,13 @@
 	Reported by Jon Leichter <jon@symas.com>
 
 Continued in ChangeLog.1999
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+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/ChangeLog.2001 b/ChangeLog.2001
index 16f6362f..25d11331 100644
--- a/ChangeLog.2001
+++ b/ChangeLog.2001
@@ -1563,3 +1563,13 @@
 	* libltdl/ltdl.h:  formatting change.
 
 Continued in ChangeLog.2000
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+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/ChangeLog.2002 b/ChangeLog.2002
index 610419c3..d2c1fdde 100644
--- a/ChangeLog.2002
+++ b/ChangeLog.2002
@@ -724,3 +724,13 @@
 	ftp.gnu.org.
 
 Continued in ChangeLog.2001
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+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/ChangeLog.2003 b/ChangeLog.2003
index 2a1172af..edf23867 100644
--- a/ChangeLog.2003
+++ b/ChangeLog.2003
@@ -1294,3 +1294,13 @@
 	so that it can be conditional on the value of $module.
 
 Continued in ChangeLog.2002
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+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/ChangeLog.2004 b/ChangeLog.2004
index 1c3e6dbd..62e52c3f 100644
--- a/ChangeLog.2004
+++ b/ChangeLog.2004
@@ -3566,3 +3566,13 @@
 	* NEWS: Next release will be in 2004.
 
 Continued in ChangeLog.2003
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+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/ChangeLog.2005 b/ChangeLog.2005
index 7995db86..55c30a15 100644
--- a/ChangeLog.2005
+++ b/ChangeLog.2005
@@ -2791,3 +2791,13 @@
 	...and make use of new names.
 
 Continued in ChangeLog.2004
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+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/ChangeLog.2006 b/ChangeLog.2006
index c9a7ec0a..a223ba24 100644
--- a/ChangeLog.2006
+++ b/ChangeLog.2006
@@ -811,3 +811,13 @@
 	* ChangeLog: ..here.
 
 Continued in ChangeLog.2005
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+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/ChangeLog.2007 b/ChangeLog.2007
index 23e3107b..0b2778b1 100644
--- a/ChangeLog.2007
+++ b/ChangeLog.2007
@@ -1365,3 +1365,13 @@
 	* TODO: Likewise.
 
 Continued in ChangeLog.2006
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+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/ChangeLog.2008 b/ChangeLog.2008
index 28ce0a94..5fa26998 100644
--- a/ChangeLog.2008
+++ b/ChangeLog.2008
@@ -1901,3 +1901,13 @@
 	libltdl/m4/libtool.m4: Bump copyright years.
 
 Continued in ChangeLog.2007
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+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/ChangeLog.2009 b/ChangeLog.2009
index 2e476fe9..d7d84ac5 100644
--- a/ChangeLog.2009
+++ b/ChangeLog.2009
@@ -1066,3 +1066,13 @@
 Continued in ChangeLog.2008
 
 vim:tw=72
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+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/HACKING b/HACKING
index 5e045ac2..468f54bf 100644
--- a/HACKING
+++ b/HACKING
@@ -417,21 +417,26 @@ yyyy-mm-dd  Name of Author  <email@address>  (tiny change)
 ===================
 
 GNU Libtool uses 3 different licenses for various of the files distributed
-herein, with 7 variations on license text.  It is important that you use
-the correct license text in each new file added.  Here are the texts
-along with some notes on when each is appropriate.  Appropriate commenting
-(shell, C etc) and decoration (m4sh etc) assumed throughout.
+herein, with several variations on license text.  It is important that
+you use the correct license text in each new file added.  Here are the
+texts along with some notes on when each is appropriate.  Appropriate
+commenting (shell, C etc) and decoration (m4sh etc) assumed throughout.
+
+
 
 11.1. Notice preservation
 
-Autoconf macros and files used to generate them need this license:
+Autoconf macros and files used to generate them need this license, along
+with files such as HACKING, NEWS, README, README.alpha, TODO and
+ChangeLogs:
 
    Copyright (C) <year list> Free Software Foundation, Inc.
    Written by <author>, <year>
 
-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.
+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.
 
 
 
@@ -444,36 +449,6 @@ below:
    Copyright (C) <year list> Free Software Foundation, Inc.
    Written by <author>, <year>
 
-  This file is part of GNU Libtool.
-
-GNU Libtool 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 of
-the License, or (at your option) any later version.
-
-GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
-can be downloaded from  http://www.gnu.org/licenses/gpl.html,
-or obtained by writing to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-
-11.3. GPL with Libtool exception clause
-
-At the moment only `libltdl/README' needs the exception clause to
-allow projects that distribute a copy of the libltdl sources to also
-redistribute the README:
-
-
-   Copyright (C) <year list> Free Software Foundation, Inc.
-   Written by <author>, <year>
-
    This file is part of GNU Libtool.
 
 GNU Libtool is free software; you can redistribute it and/or
@@ -481,11 +456,6 @@ modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of
 the License, or (at your option) any later version.
 
-As a special exception to the GNU General Public License,
-if you distribute this file as part of a program or library that
-is built using GNU Libtool, you may include this file under the
-same distribution terms that you use for the rest of that program.
-
 GNU Libtool 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
@@ -499,47 +469,12 @@ or obtained by writing to the Free Software Foundation, Inc.,
 
 
 
-11.4. GPL with Cvs-utils exception clause
+11.3. GPL with self extracting version
 
-GNU Libtool imports some m4sh infrastructure from the GNU Cvs-utils
-project, namely `getopt.m4sh' and `general.m4sh'.  Those files use
-the GPL with their own exception clause as follows:
-
-   Copyright (C) <year list> Free Software Foundation, Inc.
-   Written by <author>, <year>
-
-   This file is part of GNU Cvs-utils.
-
-GNU Cvs-utils 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 of
-the License, or (at you option) any later version.
-
-As a special exception to the GNU General Public License, if you
-distribute this file as part of a program or library that contains
-a configuration script generated by Autoconf, you may include this
-file under the same distribution terms that you use for the rest
-of that program.
-
-GNU Cvs-utils is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNES 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 GNU Libtool; see the file COPYING.  If not, a copy
-can be downloaded from  http://www.gnu.org/licenses/gpl.html,
-or obtained by writing to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-
-11.5. GPL with self extracting version
-
-Some of the sources built atop Cvs-utils' m4sh framework use
-getopt.m4sh:func_version() to extract their --version output from
-the copyright block.  Those files also need the --version copyright
-text paragraph as follows:
+Some of the sources built atop the getopt.m4sh framework use
+func_version() to extract their --version output from the copyright
+block.  Those files also need the --version copyright text paragraph as
+follows:
 
    <program name> (GNU @PACKAGE@) <version number>
    Written by <author> <email address>.
@@ -568,7 +503,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
 
 
 
-11.6. GPL with self extracting version and Libtool exception clause
+11.4. GPL with self extracting version and Libtool exception clause
 
 Although the libtool script is generated from `ltmain.m4sh' according
 to the rules in the preceding subsection, it also needs the Libtool
@@ -607,7 +542,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
 
 
 
-11.7. LGPL with Libtool exception clause
+11.5. LGPL with Libtool exception clause
 
 Finally, not only is Libltdl is LGPLed, but it is routinely
 redistributed inside projects that use it, so its sources need to use
@@ -785,23 +720,12 @@ or obtained by writing to the Free Software Foundation, Inc.,
   Inc.
   Written by Gary V. Vaughan, 2004
 
-  This file is part of GNU Libtool.  Report bugs to bug-libtool@gnu.org.
-
-GNU Libtool 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
-of the License, or (at your option) any later version.
-
-GNU Libtool 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.
+  This file is part of GNU Libtool.
 
-You should have received a copy of the GNU General Public License
-along with GNU Libtool; see the file COPYING.  If not, a copyi
-can be downloaded from http://www.gnu.org/licenses/gpl.html,
-or obtained by writing to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+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: text
diff --git a/NEWS b/NEWS
index 38129177..677539b7 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,9 @@ New in 2.2.9b 2010-??-??: git version 2.2.9a, Libtool team:
 
 * New features:
 
-  - None.
+  - On non-cygwin Windows systems, we no longer try to lookup the POSIX
+    format path recorded in $libdir of a pseudo-library when looking up
+    the location of the library with the native tools.
 
 * Changes in supported systems or compilers:
 
@@ -14,7 +16,7 @@ New in 2.2.8 2010-06-05: git version 2.2.7c, Libtool team:
 
 * No new features:
 
-  - Bumped version number and romoted 2.2.7b release candidate to a full
+  - Bumped version number and promoted 2.2.7b release candidate to a full
     stable release.
 
 New in 2.2.7b 2010-05-20: git version 2.2.7a, Libtool team:
@@ -50,7 +52,7 @@ New in 2.2.7b 2010-05-20: git version 2.2.7a, Libtool team:
   - Improved support for 64bit Windows (mingw64).
   - Improved support for cegcc (Windows CE/PocketPC).
   - Support for GNU/kOpenSolaris (kopensolaris*-gnu).
-  - Initial support for compilers on BlueGene BG/L.
+  - Initial support for compilers on BlueGene BG/P.
   - Improved support for Atari FreeMiNT.
   - With binutils 2.19.50+, shared libraries can be built on AIX.
   - Initial support for the Cuda Compiler Driver on GNU/Linux.
@@ -887,3 +889,13 @@ New in 0.2:
 New in 0.1:
 * First release of libtool
 * Support for: *-*-freebsd*, *-*-netbsd*, *-*-sunos4*, *-*-ultrix4*
+-- 
+  Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+  2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  This file is part of GNU Libtool.
+
+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 b/README
index 612699e8..0a9317ff 100644
--- a/README
+++ b/README
@@ -180,21 +180,10 @@ For more details about version numbers, see:
 
   This file is part of GNU Libtool.
 
-GNU Libtool 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
-of the License, or (at your option) any later version.
-
-GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
-can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-obtained by writing to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+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:
diff --git a/README.alpha b/README.alpha
index 903fafb5..a785a7b7 100644
--- a/README.alpha
+++ b/README.alpha
@@ -120,21 +120,10 @@ send the file `tests/testsuite.log' to the bug report mailing list,
 
   This file is part of GNU Libtool.
 
-GNU Libtool 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
-of the License, or (at your option) any later version.
-
-GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
-can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-obtained by writing to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+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:
diff --git a/TODO b/TODO
index 8a9ed7e8..fda57642 100644
--- a/TODO
+++ b/TODO
@@ -285,21 +285,10 @@ GNU Libtool
 
   This file is part of GNU Libtool.
 
-GNU Libtool 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 of
-the License, or (at your option) any later version.
-
-GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
-can be downloaded from  http://www.gnu.org/licenses/gpl.html,
-or obtained by writing to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+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: text
diff --git a/clcommit.m4sh b/clcommit.m4sh
index ff27f9de..6157cd29 100644
--- a/clcommit.m4sh
+++ b/clcommit.m4sh
@@ -5,7 +5,8 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 # Written by Gary V. Vaughan <gary@gnu.org>
 # and Alexandre Oliva <aoliva@redhat.com>
 
-# Copyright (C) 1999, 2000, 2004, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2004, 2006, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -265,18 +266,11 @@ func_commit ()
     test $# -gt 0 && subject="$@"
 
     test $# -gt 0 || { set dummy -a; shift; }
-    func_verbose "$GIT commit $git_flags -F $log_file ${1+$@}"
-    $opt_dry_run ||
-        $GIT commit $git_flags -F $log_file ${1+"$@"} || exit $EXIT_FAILURE
+    func_show_eval "$GIT commit $git_flags -F $log_file ${1+$@}" "exit $EXIT_FAILURE"
 
     $opt_push && {
-      func_verbose "$GIT push"
-      $opt_dry_run || $GIT push
-
-      $opt_tags && {
-	  func_verbose "$GIT push --tags"
-	  $opt_dry_run || $GIT push --tags
-      }
+      func_show_eval "$GIT push"
+      $opt_tags && func_show_eval "$GIT push --tags"
     }
 
     :
@@ -336,7 +330,9 @@ func_mailnotify ()
   grep '[^ 	]' < "$log_file" > /dev/null ||
     func_fatal_error "empty commit message, aborting"
 
-  if grep '^$' < "$log_file" > /dev/null; then
+  # We expect line 2 to be blank, since it separates the git summary line from
+  # the commit message body, but any others are probably an error:
+  if sed 2d "$log_file" | grep '^$' > /dev/null; then
     func_error "*** Warning: blank lines should not appear within commit messages."
     func_error "*** They should be used to separate distinct commits."
   fi
diff --git a/libltdl/README b/libltdl/README
index e533467a..54b1aea8 100644
--- a/libltdl/README
+++ b/libltdl/README
@@ -14,24 +14,7 @@ It supports the following dlopen interfaces:
 
    This file is part of GNU Libtool.
 
-GNU Libtool 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 of
-the License, or (at your option) any later version.
-
-As a special exception to the GNU General Public License,
-if you distribute this file as part of a program or library that
-is built using GNU Libtool, you may include this file under the
-same distribution terms that you use for the rest of that program.
-
-GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
-can be downloaded from  http://www.gnu.org/licenses/gpl.html,
-or obtained by writing to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
+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/libltdl/config/general.m4sh b/libltdl/config/general.m4sh
index 90722bc5..bb254ccc 100644
--- a/libltdl/config/general.m4sh
+++ b/libltdl/config/general.m4sh
@@ -1,40 +1,39 @@
-m4_if([general.m4sh -- general shell script boiler plate -*- Autoconf -*-
-
-   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-   Written by Gary V. Vaughan, 2004
-
-   This file is part of GNU Cvs-utils.
-
-GNU Cvs-utils 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 of
-the License, or (at you option) any later version.
-
-As a special exception to the GNU General Public License, if you
-distribute this file as part of a program or library that contains
-a configuration script generated by Autoconf, you may include this
-file under the same distribution terms that you use for the rest
-of that program.
-
-GNU Cvs-utils is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNES 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 GNU Libtool; see the file COPYING.  If not, a copy
-can be downloaded from  http://www.gnu.org/licenses/gpl.html,
-or obtained by writing to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])dnl
-
-m4_define([M4SH_VERBATIM], [$1])dnl
+m4_divert_push([KILL])					-*- Autoconf -*-
+# general.m4sh -- general shell script boiler plate
+#
+#   Copyright (C) 2004, 2005, 2007, 2008, 2010 Free Software Foundation, Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool 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 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from  http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+m4_define([M4SH_VERBATIM], [$1])
 
 m4_ifndef([M4SH_IN_HEADER],
 [m4_define([M4SH_IN_HEADER],
 [m4_divert_text([HEADER-COPYRIGHT], [$1])])])
 
-M4SH_IN_HEADER([dnl
+m4_divert_pop([KILL])M4SH_IN_HEADER([dnl
 # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
 # is ksh but when the shell is invoked as "sh" and the current value of
 # the _XPG environment variable is not equal to 1 (one), the special
@@ -561,4 +560,3 @@ func_show_eval_locale ()
     fi
 }
 ]])
-
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index 70f40e63..2899539c 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -1,7 +1,8 @@
-m4_include([general.m4sh])m4_divert_push([KILL])
-# getopt.m4sh -- getopt helper functions		 -*- Autoconf -*-
+m4_include([general.m4sh])m4_divert_push([KILL])	-*- Autoconf -*-
+# getopt.m4sh -- getopt helper functions
 #
-#    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+#    Foundation, Inc.
 #    Written by Gary V. Vaughan, 2004
 #
 #    This file is part of GNU Libtool.
@@ -9,7 +10,7 @@ m4_include([general.m4sh])m4_divert_push([KILL])
 # GNU Libtool 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 of
-# the License, or (at you option) any later version.
+# the License, or (at your option) any later version.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program or library that contains
@@ -505,7 +506,7 @@ func_version ()
 	:more
 	/\./!{
 	  N
-	  s/\n# //
+	  s/\n# / /
 	  b more
 	}
 	:go
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 4e1a4025..e1b4e2f2 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -1076,12 +1076,17 @@ parse_dotla_file(FILE *file, char **dlname, char **libdir, char **deplibs,
 	{
 	  errors += trim (old_name, &line[sizeof (STR_OLD_LIBRARY) - 1]);
 	}
+
+      /* Windows native tools do not understand the POSIX paths we store
+	 in libdir. */
+#ifndef __WINDOWS__
 #undef  STR_LIBDIR
 #define STR_LIBDIR	"libdir="
       else if (strncmp (line, STR_LIBDIR, sizeof (STR_LIBDIR) - 1) == 0)
 	{
 	  errors += trim (libdir, &line[sizeof(STR_LIBDIR) - 1]);
 	}
+#endif
 
 #undef  STR_DL_DEPLIBS
 #define STR_DL_DEPLIBS	"dependency_libs="
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 8cbc6a62..cfe4aaac 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -5,7 +5,8 @@ AS_INIT[]m4_divert_push([HEADER-COPYRIGHT])dnl
 # libtoolize (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
 # Written by Gary V. Vaughan <gary@gnu.org>, 2003
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 7f9afe90..71b9dc47 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -151,21 +151,19 @@ AT_KEYWORDS([autoconf automake])
 # LT_AT_CONFIGURE([OPTIONS])
 # --------------------------
 m4_define([LT_AT_CONFIGURE],
-[( SHELL=${CONFIG_SHELL-/bin/sh}
-   AT_CHECK([CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options $1],
-	 [0], [ignore], [ignore])
- )
+[AT_CHECK([: ${CONFIG_SHELL=/bin/sh}; export CONFIG_SHELL; ]dnl
+	  [$CONFIG_SHELL ./configure $configure_options $1],
+	  [0], [ignore], [ignore])
 ])
 
 
 # LT_AT_MAKE([TGTS], [VARS])
 # --------------------------
 m4_define([LT_AT_MAKE],
-[( $unset LIBTOOL LIBTOOLIZE
-  for target in m4_default([$1], [all])
-  do
-    AT_CHECK([$MAKE $target $2], [0], [ignore], [ignore])
-  done )
+[for target in m4_default([$1], [all])
+do
+  AT_CHECK([$unset LIBTOOL LIBTOOLIZE; $MAKE $target $2], [0], [ignore], [ignore])
+done
 ])