From: Amos Jeffries Date: Fri, 16 Jan 2026 15:49:14 +0000 (+0000) Subject: Maintenance: update copyright comment prefix in M4 code (#2347) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c122dd556cbb57ba483b7d287c774c84610d325;p=thirdparty%2Fsquid.git Maintenance: update copyright comment prefix in M4 code (#2347) Use 'dnl' instead of hash to elide the unnecessary blurbs from generated output. --- diff --git a/CREDITS b/CREDITS index bf3058ad12..1a14fb8e36 100644 --- a/CREDITS +++ b/CREDITS @@ -86,21 +86,21 @@ research project called The Harvest Information Discovery and Access System: acinclude/ax_cxx_compile_stdcxx.m4: -# Copyright (c) 2008 Benjamin Kosnik -# Copyright (c) 2012 Zack Weinberg -# Copyright (c) 2013 Roy Stogner -# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov -# Copyright (c) 2015 Paul Norman -# Copyright (c) 2015 Moritz Klammler -# Copyright (c) 2016, 2018 Krzesimir Nowak -# Copyright (c) 2019 Enji Cooper -# Copyright (c) 2020 Jason Merrill -# Copyright (c) 2021 Jörn Heusipp -# -# 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 any -# warranty. +dnl Copyright (c) 2008 Benjamin Kosnik +dnl Copyright (c) 2012 Zack Weinberg +dnl Copyright (c) 2013 Roy Stogner +dnl Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov +dnl Copyright (c) 2015 Paul Norman +dnl Copyright (c) 2015 Moritz Klammler +dnl Copyright (c) 2016, 2018 Krzesimir Nowak +dnl Copyright (c) 2019 Enji Cooper +dnl Copyright (c) 2020 Jason Merrill +dnl Copyright (c) 2021 Jörn Heusipp +dnl +dnl Copying and distribution of this file, with or without modification, are +dnl permitted in any medium without royalty provided the copyright notice +dnl and this notice are preserved. This file is offered as-is, without any +dnl warranty. ============================================================================== @@ -117,26 +117,26 @@ dnl and this notice are preserved. acinclude/pkg.m4: -# Copyright © 2004 Scott James Remnant . -# -# 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 2 of the License, or -# (at your option) any later version. -# -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +dnl Copyright © 2004 Scott James Remnant . +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that program. ============================================================================== diff --git a/acinclude/ax_cxx_compile_stdcxx.m4 b/acinclude/ax_cxx_compile_stdcxx.m4 index aaf87d1c0f..69eea0650d 100644 --- a/acinclude/ax_cxx_compile_stdcxx.m4 +++ b/acinclude/ax_cxx_compile_stdcxx.m4 @@ -1,54 +1,54 @@ -## Copyright (C) 1996-2026 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## - -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) -# -# DESCRIPTION -# -# Check for baseline language coverage in the compiler for the specified -# version of the C++ standard. If necessary, add switches to CXX and -# CXXCPP to enable support. VERSION may be '11', '14', '17', or '20' for -# the respective C++ standard version. -# -# The second argument, if specified, indicates whether you insist on an -# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. -# -std=c++11). If neither is specified, you get whatever works, with -# preference for no added switch, and then for an extended mode. -# -# The third argument, if specified 'mandatory' or if left unspecified, -# indicates that baseline support for the specified C++ standard is -# required and that the macro should error out if no mode with that -# support is found. If specified 'optional', then configuration proceeds -# regardless, after defining HAVE_CXX${VERSION} if and only if a -# supporting mode is found. -# -# LICENSE -# -# Copyright (c) 2008 Benjamin Kosnik -# Copyright (c) 2012 Zack Weinberg -# Copyright (c) 2013 Roy Stogner -# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov -# Copyright (c) 2015 Paul Norman -# Copyright (c) 2015 Moritz Klammler -# Copyright (c) 2016, 2018 Krzesimir Nowak -# Copyright (c) 2019 Enji Cooper -# Copyright (c) 2020 Jason Merrill -# Copyright (c) 2021 Jörn Heusipp -# -# 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 any -# warranty. +dnl Copyright (C) 1996-2026 The Squid Software Foundation and contributors +dnl +dnl Squid software is distributed under GPLv2+ license and includes +dnl contributions from numerous individuals and organizations. +dnl Please see the COPYING and CONTRIBUTORS files for details. +dnl + +dnl =========================================================================== +dnl https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html +dnl =========================================================================== +dnl +dnl SYNOPSIS +dnl +dnl AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) +dnl +dnl DESCRIPTION +dnl +dnl Check for baseline language coverage in the compiler for the specified +dnl version of the C++ standard. If necessary, add switches to CXX and +dnl CXXCPP to enable support. VERSION may be '11', '14', '17', or '20' for +dnl the respective C++ standard version. +dnl +dnl The second argument, if specified, indicates whether you insist on an +dnl extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. +dnl -std=c++11). If neither is specified, you get whatever works, with +dnl preference for no added switch, and then for an extended mode. +dnl +dnl The third argument, if specified 'mandatory' or if left unspecified, +dnl indicates that baseline support for the specified C++ standard is +dnl required and that the macro should error out if no mode with that +dnl support is found. If specified 'optional', then configuration proceeds +dnl regardless, after defining HAVE_CXX${VERSION} if and only if a +dnl supporting mode is found. +dnl +dnl LICENSE +dnl +dnl Copyright (c) 2008 Benjamin Kosnik +dnl Copyright (c) 2012 Zack Weinberg +dnl Copyright (c) 2013 Roy Stogner +dnl Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov +dnl Copyright (c) 2015 Paul Norman +dnl Copyright (c) 2015 Moritz Klammler +dnl Copyright (c) 2016, 2018 Krzesimir Nowak +dnl Copyright (c) 2019 Enji Cooper +dnl Copyright (c) 2020 Jason Merrill +dnl Copyright (c) 2021 Jörn Heusipp +dnl +dnl Copying and distribution of this file, with or without modification, are +dnl permitted in any medium without royalty provided the copyright notice +dnl and this notice are preserved. This file is offered as-is, without any +dnl warranty. #serial 15 diff --git a/acinclude/ax_with_prog.m4 b/acinclude/ax_with_prog.m4 index 125c2378ab..f267ba37c1 100644 --- a/acinclude/ax_with_prog.m4 +++ b/acinclude/ax_with_prog.m4 @@ -1,9 +1,9 @@ -## Copyright (C) 1996-2026 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## +dnl Copyright (C) 1996-2026 The Squid Software Foundation and contributors +dnl +dnl Squid software is distributed under GPLv2+ license and includes +dnl contributions from numerous individuals and organizations. +dnl Please see the COPYING and CONTRIBUTORS files for details. +dnl dnl =========================================================================== dnl http://autoconf-archive.cryp.to/ax_with_prog.html diff --git a/acinclude/compiler-flags.m4 b/acinclude/compiler-flags.m4 index eaafbf39b5..343d03a5a3 100644 --- a/acinclude/compiler-flags.m4 +++ b/acinclude/compiler-flags.m4 @@ -1,9 +1,9 @@ -## Copyright (C) 1996-2026 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## +dnl Copyright (C) 1996-2026 The Squid Software Foundation and contributors +dnl +dnl Squid software is distributed under GPLv2+ license and includes +dnl contributions from numerous individuals and organizations. +dnl Please see the COPYING and CONTRIBUTORS files for details. +dnl # check if the compiler accepts a supplied flag # first argument is the variable containing the result diff --git a/acinclude/init.m4 b/acinclude/init.m4 index e347bc4f2b..9d23a9afa6 100644 --- a/acinclude/init.m4 +++ b/acinclude/init.m4 @@ -1,9 +1,9 @@ -## Copyright (C) 1996-2026 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## +dnl Copyright (C) 1996-2026 The Squid Software Foundation and contributors +dnl +dnl Squid software is distributed under GPLv2+ license and includes +dnl contributions from numerous individuals and organizations. +dnl Please see the COPYING and CONTRIBUTORS files for details. +dnl dnl This encapsulates the nasty mess of headers we need to check when dnl checking types. diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4 index a09cabd645..cdd070861d 100644 --- a/acinclude/krb5.m4 +++ b/acinclude/krb5.m4 @@ -1,9 +1,9 @@ -## Copyright (C) 1996-2026 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## +dnl Copyright (C) 1996-2026 The Squid Software Foundation and contributors +dnl +dnl Squid software is distributed under GPLv2+ license and includes +dnl contributions from numerous individuals and organizations. +dnl Please see the COPYING and CONTRIBUTORS files for details. +dnl dnl check whether the Kerberos context has a memory cache AC_DEFUN([SQUID_CHECK_KRB5_CONTEXT_MEMORY_CACHE],[ diff --git a/acinclude/ldap.m4 b/acinclude/ldap.m4 index 54d9801d42..90547781b6 100644 --- a/acinclude/ldap.m4 +++ b/acinclude/ldap.m4 @@ -1,9 +1,9 @@ -# Copyright (C) 1996-2026 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## +dnl Copyright (C) 1996-2026 The Squid Software Foundation and contributors +dnl +dnl Squid software is distributed under GPLv2+ license and includes +dnl contributions from numerous individuals and organizations. +dnl Please see the COPYING and CONTRIBUTORS files for details. +dnl dnl checks for LDAP functionality AC_DEFUN([SQUID_LDAP_TEST],[ diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4 index 573ca17586..b5d132d239 100644 --- a/acinclude/lib-checks.m4 +++ b/acinclude/lib-checks.m4 @@ -1,9 +1,9 @@ -## Copyright (C) 1996-2026 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## +dnl Copyright (C) 1996-2026 The Squid Software Foundation and contributors +dnl +dnl Squid software is distributed under GPLv2+ license and includes +dnl contributions from numerous individuals and organizations. +dnl Please see the COPYING and CONTRIBUTORS files for details. +dnl AC_DEFUN([SQUID_CHECK_LIBIPHLPAPI],[ AC_CACHE_CHECK([for libIpHlpApi],squid_cv_have_libiphlpapi,[ diff --git a/acinclude/os-deps.m4 b/acinclude/os-deps.m4 index 4e9599e6bb..8eaec8f674 100644 --- a/acinclude/os-deps.m4 +++ b/acinclude/os-deps.m4 @@ -1,9 +1,9 @@ -## Copyright (C) 1996-2026 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## +dnl Copyright (C) 1996-2026 The Squid Software Foundation and contributors +dnl +dnl Squid software is distributed under GPLv2+ license and includes +dnl contributions from numerous individuals and organizations. +dnl Please see the COPYING and CONTRIBUTORS files for details. +dnl dnl check that epoll actually works dnl sets squid_cv_epoll_works to "yes" or "no" diff --git a/acinclude/pam.m4 b/acinclude/pam.m4 index 4c5f08553d..84458390a8 100644 --- a/acinclude/pam.m4 +++ b/acinclude/pam.m4 @@ -1,9 +1,9 @@ -## Copyright (C) 1996-2026 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## +dnl Copyright (C) 1996-2026 The Squid Software Foundation and contributors +dnl +dnl Squid software is distributed under GPLv2+ license and includes +dnl contributions from numerous individuals and organizations. +dnl Please see the COPYING and CONTRIBUTORS files for details. +dnl dnl check whether PAM's struct pam_conv takes a const (linux-style) or dnl non-const (solaris-style) parametrs to the conv function. diff --git a/acinclude/pkg.m4 b/acinclude/pkg.m4 index e9224b1cbb..7564b57b3e 100644 --- a/acinclude/pkg.m4 +++ b/acinclude/pkg.m4 @@ -1,33 +1,33 @@ -## Copyright (C) 1996-2026 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## - -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# 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 2 of the License, or -# (at your option) any later version. -# -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +dnl Copyright (C) 1996-2026 The Squid Software Foundation and contributors +dnl +dnl Squid software is distributed under GPLv2+ license and includes +dnl contributions from numerous individuals and organizations. +dnl Please see the COPYING and CONTRIBUTORS files for details. +dnl + +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 1 (pkg-config-0.24) +dnl +dnl Copyright © 2004 Scott James Remnant . +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that program. # PKG_PROG_PKG_CONFIG([MIN-VERSION]) # ---------------------------------- diff --git a/acinclude/squid-util.m4 b/acinclude/squid-util.m4 index 7f02b68848..4fa9c695ef 100644 --- a/acinclude/squid-util.m4 +++ b/acinclude/squid-util.m4 @@ -1,9 +1,9 @@ -## Copyright (C) 1996-2026 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## +dnl Copyright (C) 1996-2026 The Squid Software Foundation and contributors +dnl +dnl Squid software is distributed under GPLv2+ license and includes +dnl contributions from numerous individuals and organizations. +dnl Please see the COPYING and CONTRIBUTORS files for details. +dnl dnl save main environment variables to variables to the namespace defined by the dnl first argument (prefix) diff --git a/acinclude/tdb.m4 b/acinclude/tdb.m4 index e168248315..e80eaa2432 100644 --- a/acinclude/tdb.m4 +++ b/acinclude/tdb.m4 @@ -1,9 +1,9 @@ -## Copyright (C) 1996-2026 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## +dnl Copyright (C) 1996-2026 The Squid Software Foundation and contributors +dnl +dnl Squid software is distributed under GPLv2+ license and includes +dnl contributions from numerous individuals and organizations. +dnl Please see the COPYING and CONTRIBUTORS files for details. +dnl dnl check for --with-tdb option AC_DEFUN_ONCE([SQUID_CHECK_LIBTDB],[ diff --git a/acinclude/win32-sspi.m4 b/acinclude/win32-sspi.m4 index 0d137bdf3e..0fb87a25a4 100644 --- a/acinclude/win32-sspi.m4 +++ b/acinclude/win32-sspi.m4 @@ -1,9 +1,9 @@ -## Copyright (C) 1996-2026 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## +dnl Copyright (C) 1996-2026 The Squid Software Foundation and contributors +dnl +dnl Squid software is distributed under GPLv2+ license and includes +dnl contributions from numerous individuals and organizations. +dnl Please see the COPYING and CONTRIBUTORS files for details. +dnl # Checks whether the Windows SSPI requirements are available and work. # Sets squid_cv_win32_sspi to "yes" or "no".