Re: Bump Autoconf license

[Ralf Wildenhues]

Hi Eric, Brett,

Brett, could you publish the Autoconf Exception on gnu.org?  Thanks!

* Eric Blake wrote on Wed, Sep 09, 2009 at 02:58:42PM CEST:
> According to Ralf Wildenhues on 9/8/2009 11:32 PM:
> > There was no discussion regarding the second Autoconf license exception
> > RFC.  So, OK to commit (if distcheck passes)?
> 
> One thing to fix first, but after that, I'm okay with pushing the patch.

Thanks!  I've pushed the patch with the changes below squashed in.

> > I noted that some external files in build-aux also use the old wording
> > together with v3; that should be fixed in gnulib/texinfo.
> 
> Can you ping the upstream owners of those files?

I intend to provide patches to upstream, yes.

> >  autoconf (@PACKAGE_NAME@) @VERSION@
> >  Copyright (C) @RELEASE_YEAR@ Free Software Foundation, Inc.
> > -License GPLv2+: GNU GPL version 2 or later
> > -<http://gnu.org/licenses/old-licenses/gpl-2.0.html>
> > +License GPLv3+: GNU GPL version 3 or later 
> > <http://gnu.org/licenses/gpl.html>
> 
> Per the GNU Coding Standards,
> http://www.gnu.org/software/automake/manual/standards.html#g_t_002d_002dversion,
> I would feel more comfortable seeing all the program's --version output
> include:
> 
> License GPLv3+/Autoconf: GNU GPL version 3 or later
> <http://gnu.org/licenses/gpl.html>, <http://gnu.org/licenses/exceptions.html>
> 
> (those two URLs fit in one 80-columns row, even if the email wrapped)

Indeed, that seems to be a better statement; I overlooked this issue
completely.  Thanks.  I've changed the --version output of all programs
in autoconf/bin/ now.

> Or, if we know what URL the Autoconf exception will be given, even calling
> out that particular page.

Yes, we can change that then, too.

Thanks!
Ralf

    * bin/autoconf.as, bin/autoheader.in, bin/autom4te.in,
    bin/autoreconf.in, bin/autoscan.in, bin/autoupdate.in,
    bin/ifnames.in: Bump to GPLv3+, adjust --version output
    to reflect this plus the Autoconf Exception.

diff --git a/bin/autoconf.as b/bin/autoconf.as
index 0f9df01..f81863e 100644
--- a/bin/autoconf.as
+++ b/bin/autoconf.as
@@ -68,7 +68,8 @@ General help using GNU software: 
<http://www.gnu.org/gethelp/>."]
 version=["\
 autoconf (@PACKAGE_NAME@) @VERSION@
 Copyright (C) @RELEASE_YEAR@ Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv3+/Autoconf: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>, <http://gnu.org/licenses/exceptions.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
 
diff --git a/bin/autoheader.in b/bin/autoheader.in
index 8bf88a3..c3b9c09 100644
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -89,7 +89,8 @@ General help using GNU software: 
<http://www.gnu.org/gethelp/>.
 # --------
 $version = "autoheader (@PACKAGE_NAME@) @VERSION@
 Copyright (C) @RELEASE_YEAR@ Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv3+/Autoconf: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>, <http://gnu.org/licenses/exceptions.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
 
diff --git a/bin/autom4te.in b/bin/autom4te.in
index 6202a47..2e7fc04 100644
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -207,7 +207,8 @@ General help using GNU software: 
<http://www.gnu.org/gethelp/>.
 $version =  <<"EOF";
 autom4te (@PACKAGE_NAME@) @VERSION@
 Copyright (C) @RELEASE_YEAR@ Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv3+/Autoconf: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>, <http://gnu.org/licenses/exceptions.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
 
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index d01ac85..e7b60ef 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -98,7 +98,8 @@ General help using GNU software: 
<http://www.gnu.org/gethelp/>.
 # --------
 $version = "autoreconf (@PACKAGE_NAME@) @VERSION@
 Copyright (C) @RELEASE_YEAR@ Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv3+/Autoconf: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>, <http://gnu.org/licenses/exceptions.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
 
diff --git a/bin/autoscan.in b/bin/autoscan.in
index a3d98e8..1e2980f 100644
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -125,7 +125,8 @@ General help using GNU software: 
<http://www.gnu.org/gethelp/>.
 # --------
 $version = "autoscan (@PACKAGE_NAME@) @VERSION@
 Copyright (C) @RELEASE_YEAR@ Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv3+/Autoconf: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>, <http://gnu.org/licenses/exceptions.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
 
diff --git a/bin/autoupdate.in b/bin/autoupdate.in
index d6e36e0..2bff59d 100644
--- a/bin/autoupdate.in
+++ b/bin/autoupdate.in
@@ -85,7 +85,8 @@ General help using GNU software: 
<http://www.gnu.org/gethelp/>.
 # --------
 $version = "autoupdate (@PACKAGE_NAME@) @VERSION@
 Copyright (C) @RELEASE_YEAR@ Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv3+/Autoconf: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>, <http://gnu.org/licenses/exceptions.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
 
diff --git a/bin/ifnames.in b/bin/ifnames.in
index 12528b0..17141a4 100644
--- a/bin/ifnames.in
+++ b/bin/ifnames.in
@@ -68,7 +68,8 @@ General help using GNU software: 
<http://www.gnu.org/gethelp/>.
 # --------
 $version = "ifnames (@PACKAGE_NAME@) @VERSION@
 Copyright (C) @RELEASE_YEAR@ Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv3+/Autoconf: GNU GPL version 3 or later
+<http://gnu.org/licenses/gpl.html>, <http://gnu.org/licenses/exceptions.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.