From e3bbd99c31847420fd31dcea84b26ffa4efa8327 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 5 Sep 2024 18:31:29 -0700 Subject: [PATCH] Fix COPYING.EXCEPTION license notices Problem reported by Bruno Haible in: https://lists.gnu.org/r/bug-gnulib/2024-08/msg00227.html * m4/std-gnu11.m4: Fix license notice to use COPYING.EXCEPTION correctly. --- ChangeLog | 8 ++++++++ m4/std-gnu11.m4 | 19 ++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 310703b1fa..3e00ff9390 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-09-05 Paul Eggert + + Fix COPYING.EXCEPTION license notices + Problem reported by Bruno Haible in: + https://lists.gnu.org/r/bug-gnulib/2024-08/msg00227.html + * m4/std-gnu11.m4: Fix license notice to use COPYING.EXCEPTION + correctly. + 2024-09-04 Bruno Haible Resolve conflicts for functions introduced in Android API level 35. diff --git a/m4/std-gnu11.m4 b/m4/std-gnu11.m4 index 37324c158e..e1253e12d6 100644 --- a/m4/std-gnu11.m4 +++ b/m4/std-gnu11.m4 @@ -1,11 +1,12 @@ # std-gnu11.m4 -# serial 1 +# serial 1.1 # Prefer GNU C11 and C++11 to earlier versions. -*- coding: utf-8 -*- # This implementation is taken from GNU Autoconf lib/autoconf/c.m4 # commit 017d5ddd82854911f0119691d91ea8a1438824d6 # dated Sun Apr 3 13:57:17 2016 -0700 +# with minor changes to commentary. # This implementation will be obsolete once we can assume Autoconf 2.70 # or later is installed everywhere a Gnulib program might be developed. @@ -14,9 +15,10 @@ m4_version_prereq([2.70], [], [ # Copyright (C) 2001-2024 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 +# This file is part of Autoconf. 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, @@ -24,8 +26,15 @@ m4_version_prereq([2.70], [], [ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # +# Under Section 7 of GPL version 3, you are granted additional +# permissions described in the Autoconf Configure Script Exception, +# version 3.0, as published by the Free Software Foundation. +# # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# and a copy of the Autoconf Configure Script Exception along with +# this program; see the files COPYINGv3 and COPYING.EXCEPTION +# respectively. If not, see and +# . # Written by David MacKenzie, with help from # Akim Demaille, Paul Eggert, -- 2.39.5