From: Akim Demaille Date: Mon, 20 Aug 2001 14:44:11 +0000 (+0000) Subject: * lib/autoconf/autoconf.m4, lib/autoconf/oldnames.m4, X-Git-Tag: AUTOCONF-2.52d~77 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad80ccfe86f000b3fa21cac000b3d02bf3fa39fe;p=thirdparty%2Fautoconf.git * lib/autoconf/autoconf.m4, lib/autoconf/oldnames.m4, * lib/autotest/general.m4: Adjust the license. --- diff --git a/ChangeLog b/ChangeLog index ec32506e9..8d635574c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-08-20 Akim Demaille + + * lib/autoconf/autoconf.m4, lib/autoconf/oldnames.m4, + * lib/autotest/general.m4: Adjust the license. + 2001-08-17 Paul Eggert * doc/autoconf.texi (Function Portability): Mention snprintf, diff --git a/lib/autoconf/autoconf.m4 b/lib/autoconf/autoconf.m4 index 7aa399909..536513a84 100644 --- a/lib/autoconf/autoconf.m4 +++ b/lib/autoconf/autoconf.m4 @@ -18,7 +18,34 @@ changequote()changequote([, ])include(m4sugar/m4sh.m4)# -*- Autoconf -*- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. # -# Written by David MacKenzie. +# As a special exception, the Free Software Foundation gives unlimited +# permission to copy, distribute and modify the configure scripts that +# are the output of Autoconf. You need not follow the terms of the GNU +# General Public License when using or distributing such scripts, even +# though portions of the text of Autoconf appear in them. The GNU +# General Public License (GPL) does govern all other use of the material +# that constitutes the Autoconf program. +# +# Certain portions of the Autoconf source text are designed to be copied +# (in certain cases, depending on the input) into the output of +# Autoconf. We call these the "data" portions. The rest of the Autoconf +# source text consists of comments plus executable code that decides which +# of the data portions to output in any given case. We call these +# comments and executable code the "non-data" portions. Autoconf never +# copies any of the non-data portions into its output. +# +# This special exception to the GPL applies to versions of Autoconf +# released by the Free Software Foundation. When you make and +# distribute a modified version of Autoconf, you may extend this special +# exception to the GPL to apply to your modified version as well, *unless* +# your modified version has the potential to copy into its output some +# of the text that was the non-data portion of the version that you started +# with. (In other words, unless your change moves or copies text from +# the non-data portions to the data portions.) If your modification has +# such potential, you must delete any notice of this special exception +# to the GPL from your modified version. +# +# Written by David MacKenzie and many others. # # Do not sinclude acsite.m4 here, because it may not be installed # yet when Autoconf is frozen. diff --git a/lib/autoconf/oldnames.m4 b/lib/autoconf/oldnames.m4 index b992dee8e..d3624612c 100644 --- a/lib/autoconf/oldnames.m4 +++ b/lib/autoconf/oldnames.m4 @@ -17,11 +17,38 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. # +# As a special exception, the Free Software Foundation gives unlimited +# permission to copy, distribute and modify the configure scripts that +# are the output of Autoconf. You need not follow the terms of the GNU +# General Public License when using or distributing such scripts, even +# though portions of the text of Autoconf appear in them. The GNU +# General Public License (GPL) does govern all other use of the material +# that constitutes the Autoconf program. +# +# Certain portions of the Autoconf source text are designed to be copied +# (in certain cases, depending on the input) into the output of +# Autoconf. We call these the "data" portions. The rest of the Autoconf +# source text consists of comments plus executable code that decides which +# of the data portions to output in any given case. We call these +# comments and executable code the "non-data" portions. Autoconf never +# copies any of the non-data portions into its output. +# +# This special exception to the GPL applies to versions of Autoconf +# released by the Free Software Foundation. When you make and +# distribute a modified version of Autoconf, you may extend this special +# exception to the GPL to apply to your modified version as well, *unless* +# your modified version has the potential to copy into its output some +# of the text that was the non-data portion of the version that you started +# with. (In other words, unless your change moves or copies text from +# the non-data portions to the data portions.) If your modification has +# such potential, you must delete any notice of this special exception +# to the GPL from your modified version. +# # Originally written by David J. MacKenzie. ## ---------------------------- ## -## General macros of autoconf. ## +## General macros of Autoconf. ## ## ---------------------------- ## AU_ALIAS([AC_WARN], [AC_MSG_WARN]) @@ -42,7 +69,7 @@ AU_ALIAS([AC_TEST_PROGRAM], [AC_TRY_RUN]) ## ----------------------------- ## -## Specific macros of autoconf. ## +## Specific macros of Autoconf. ## ## ----------------------------- ## AU_ALIAS([AC_CHAR_UNSIGNED], [AC_C_CHAR_UNSIGNED]) diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4 index aaa11055b..5eaf63da1 100644 --- a/lib/autotest/general.m4 +++ b/lib/autotest/general.m4 @@ -1,4 +1,5 @@ changequote()changequote([, ])include(m4sugar/m4sh.m4)# -*- Autoconf -*- +# This file is part of Autoconf. # M4 macros used in building test suites. # Copyright 2000, 2001 Free Software Foundation, Inc. @@ -17,34 +18,32 @@ changequote()changequote([, ])include(m4sugar/m4sh.m4)# -*- Autoconf -*- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# This script is part of Autotest. Unlimited permission to copy, -# distribute and modify the testing scripts that are the output of -# that Autotest script is given. You need not follow the terms of the -# GNU General Public License when using or distributing such scripts, -# even though portions of the text of Autotest appear in them. The -# GNU General Public License (GPL) does govern all other use of the -# material that constitutes the Autotest. +# As a special exception, the Free Software Foundation gives unlimited +# permission to copy, distribute and modify the configure scripts that +# are the output of Autoconf. You need not follow the terms of the GNU +# General Public License when using or distributing such scripts, even +# though portions of the text of Autoconf appear in them. The GNU +# General Public License (GPL) does govern all other use of the material +# that constitutes the Autoconf program. # -# Certain portions of the Autotest source text are designed to be -# copied (in certain cases, depending on the input) into the output of -# Autotest. We call these the "data" portions. The rest of the -# Autotest source text consists of comments plus executable code that -# decides which of the data portions to output in any given case. We -# call these comments and executable code the "non-data" portions. -# Autotest never copies any of the non-data portions into its output. +# Certain portions of the Autoconf source text are designed to be copied +# (in certain cases, depending on the input) into the output of +# Autoconf. We call these the "data" portions. The rest of the Autoconf +# source text consists of comments plus executable code that decides which +# of the data portions to output in any given case. We call these +# comments and executable code the "non-data" portions. Autoconf never +# copies any of the non-data portions into its output. # -# This special exception to the GPL applies to versions of Autotest +# This special exception to the GPL applies to versions of Autoconf # released by the Free Software Foundation. When you make and -# distribute a modified version of Autotest, you may extend this -# special exception to the GPL to apply to your modified version as -# well, *unless* your modified version has the potential to copy into -# its output some of the text that was the non-data portion of the -# version that you started with. (In other words, unless your change -# moves or copies text from the non-data portions to the data -# portions.) If your modification has such potential, you must delete -# any notice of this special exception to the GPL from your modified -# version. - +# distribute a modified version of Autoconf, you may extend this special +# exception to the GPL to apply to your modified version as well, *unless* +# your modified version has the potential to copy into its output some +# of the text that was the non-data portion of the version that you started +# with. (In other words, unless your change moves or copies text from +# the non-data portions to the data portions.) If your modification has +# such potential, you must delete any notice of this special exception +# to the GPL from your modified version. # Use of diversions: #