From 9bf1ccc71a7f2990881db64d59b0039bf412a27e Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Wed, 9 Jun 2010 19:00:19 +0700 Subject: [PATCH] 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. --- AUTHORS | 21 ++++++ ChangeLog | 32 +++++++++ ChangeLog.1996 | 10 +++ ChangeLog.1997 | 10 +++ ChangeLog.1998 | 10 +++ ChangeLog.1999 | 10 +++ ChangeLog.2000 | 10 +++ ChangeLog.2001 | 10 +++ ChangeLog.2002 | 10 +++ ChangeLog.2003 | 10 +++ ChangeLog.2004 | 10 +++ ChangeLog.2005 | 10 +++ ChangeLog.2006 | 10 +++ ChangeLog.2007 | 10 +++ ChangeLog.2008 | 10 +++ ChangeLog.2009 | 10 +++ HACKING | 126 +++++++----------------------------- NEWS | 10 +++ README | 19 ++---- README.alpha | 19 ++---- TODO | 19 ++---- libltdl/README | 25 ++----- libltdl/config/general.m4sh | 64 +++++++++--------- libltdl/config/getopt.m4sh | 6 +- 24 files changed, 278 insertions(+), 203 deletions(-) diff --git a/AUTHORS b/AUTHORS index ccd280ab2..b81076154 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 d4d8eeaec..216e6ce8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,27 @@ 2010-06-09 Gary V. Vaughan + 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. @@ -451,5 +473,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 7b5391ca0..ae9bee828 100644 --- a/ChangeLog.1996 +++ b/ChangeLog.1996 @@ -166,3 +166,13 @@ 1996-03-15 Gordon Matzigkeit * 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 b4e735f8c..992b1bad2 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 6eff17529..ca6552406 100644 --- a/ChangeLog.1998 +++ b/ChangeLog.1998 @@ -1332,3 +1332,13 @@ Thu May 28 18:59:08 1998 Ian Lance Taylor 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 27674ac85..ccabba9ed 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 99fd69b00..364716b51 100644 --- a/ChangeLog.2000 +++ b/ChangeLog.2000 @@ -1315,3 +1315,13 @@ Reported by Jon Leichter 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 16f6362f7..25d11331b 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 610419c3d..d2c1fdde0 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 2a1172af6..edf23867c 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 1c3e6dbd3..62e52c3f7 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 7995db868..55c30a150 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 c9a7ec0a4..a223ba245 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 23e3107b5..0b2778b14 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 28ce0a949..5fa269987 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 6c07b7f7a..0a43ab4f4 100644 --- a/ChangeLog.2009 +++ b/ChangeLog.2009 @@ -877,3 +877,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 5e045ac21..468f54bf7 100644 --- a/HACKING +++ b/HACKING @@ -417,21 +417,26 @@ yyyy-mm-dd Name of Author (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) Free Software Foundation, Inc. Written by , -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) Free Software Foundation, Inc. Written by , - 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) Free Software Foundation, Inc. - Written by , - 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) Free Software Foundation, Inc. - Written by , - - 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: (GNU @PACKAGE@) Written by . @@ -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 fc984a330..5fd98ec87 100644 --- a/NEWS +++ b/NEWS @@ -883,3 +883,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 612699e83..0a9317ff3 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 903fafb59..a785a7b70 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 8a9ed7e87..fda576425 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/libltdl/README b/libltdl/README index e533467a3..54b1aea87 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 90722bc57..bb254cccb 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 a8d4e7e5a..2899539c7 100644 --- a/libltdl/config/getopt.m4sh +++ b/libltdl/config/getopt.m4sh @@ -1,5 +1,5 @@ -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. @@ -10,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 -- 2.47.2