From: Amos Jeffries Date: Tue, 26 Aug 2014 02:39:30 +0000 (-0700) Subject: Boilerplate: update acinclude/ and configure.ac copyrights X-Git-Tag: SQUID_3_5_0_1~92 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d2e6f1974fce04f3a94672db7636f99f33793d0;p=thirdparty%2Fsquid.git Boilerplate: update acinclude/ and configure.ac copyrights * update CONTRIBUTORS with missing contributors * update CREDITS with missing copyright licenses - remove outdated Treehouse Networks license on rfc3596.h rfc3596.cc - shuffle some entries for easier reading. Alphabetical by first source file path. * split AX_WITH_PROG() macro into its own source file to clarify the license scope. It is provided as a standalone file by the author(s). --- diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 8cae36d9da..0f373b930b 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -218,6 +218,7 @@ Thank you! Russell Street Russell Vincent Ryan Troll + Samba Project Scott Schram Sebastien Wenske Sergio Rabellino diff --git a/CREDITS b/CREDITS index c263cda4ad..6e9aac010e 100644 --- a/CREDITS +++ b/CREDITS @@ -84,6 +84,64 @@ research project called The Harvest Information Discovery and Access System: ============================================================================== +acinclude/ax_cxx_0x_types.m4: + +## +## AX_CXX_TYPE_NULLPTR shamelessly copied from the DUNE sources under GPL version 2 +## + +============================================================================== + +acinclude/ax_cxx_compile_stdcxx_11.m4: + +# Copyright (c) 2008 Benjamin Kosnik +# Copyright (c) 2012 Zack Weinberg +# Copyright (c) 2013 Roy Stogner +# Copyright (c) 2014 Alexey Sokolov +# +# 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. + +============================================================================== + +acinclude/ax_with_prog.m4: + +dnl Copyright (c) 2008 Francesco Salvestrini +dnl Copyright (c) 2008 Dustin J. Mitchell +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. + +============================================================================== + +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. + +============================================================================== + compat/os/opensolaris_10_netdb.h: /* @@ -540,6 +598,51 @@ compat/xstrto.cc: ============================================================================== +icons/silk/: + + Silk icon set 1.3 + _________________________________________ + Mark James + http://www.famfamfam.com/lab/icons/silk/ + _________________________________________ + + This work is licensed under a + Creative Commons Attribution 2.5 License. + [ http://creativecommons.org/licenses/by/2.5/ ] + + This means you may use it for any purpose, + and make any changes you like. + All I ask is that you include a link back + to this page in your credits. + + Are you using this icon set? Send me an email + (including a link or picture if available) to + mjames@gmail.com + + Any other questions about this icon set please + contact mjames@gmail.com + + + The icons can also be used under Creative Commons Attribution 3.0 License + (Hi Debian folks!) with the following requirements: + + As an author, I would appreciate a reference to my authorship of + the Silk icon set contents within a readme file or equivalent + documentation for the software which includes the set or a subset + of the icons contained within. + +============================================================================== + +icons/SN.png: + + Squid NOW icon - copyright Squid Project + + This work is licensed under the + Creative Commons Attribution-ShareAlike 3.0 Unported Liscence (CC BY-SA 3.0) + [ http://creativecommons.org/licenses/by-sa/3.0/ ] + +============================================================================== + include/asn1.h, include/snmp_api_error.h, include/snmp_api_util.h, @@ -853,14 +956,6 @@ helpers/url_rewrite/fake/ fake.cc, url_fake_rewrite.sh: ============================================================================== -include/rfc3596.h lib/rfc3596.cc: - - This code is copyright (C) 2007-2009 by Treehouse Networks Ltd - of New Zealand. It is published and Licensed as an extension of - squid under the same conditions as the main squid application. - -============================================================================== - helpers/negotiate_auth/kerberos/ * /* @@ -923,51 +1018,6 @@ helpers/log_daemon/DB/log_db_daemon.pl.in: ============================================================================== -icons/SN.png: - - Squid NOW icon - copyright Squid Project - - This work is licensed under the - Creative Commons Attribution-ShareAlike 3.0 Unported Liscence (CC BY-SA 3.0) - [ http://creativecommons.org/licenses/by-sa/3.0/ ] - -============================================================================== - -icons/silk/: - - Silk icon set 1.3 - _________________________________________ - Mark James - http://www.famfamfam.com/lab/icons/silk/ - _________________________________________ - - This work is licensed under a - Creative Commons Attribution 2.5 License. - [ http://creativecommons.org/licenses/by/2.5/ ] - - This means you may use it for any purpose, - and make any changes you like. - All I ask is that you include a link back - to this page in your credits. - - Are you using this icon set? Send me an email - (including a link or picture if available) to - mjames@gmail.com - - Any other questions about this icon set please - contact mjames@gmail.com - - - The icons can also be used under Creative Commons Attribution 3.0 License - (Hi Debian folks!) with the following requirements: - - As an author, I would appreciate a reference to my authorship of - the Silk icon set contents within a readme file or equivalent - documentation for the software which includes the set or a subset - of the icons contained within. - -============================================================================== - shm_portable_segment_name_is_path() implementation: Derived from boost/interprocess/shared_memory_object.hpp and diff --git a/acinclude/ax_cxx_0x_types.m4 b/acinclude/ax_cxx_0x_types.m4 index 615a7de0ac..ffc7e4ac13 100644 --- a/acinclude/ax_cxx_0x_types.m4 +++ b/acinclude/ax_cxx_0x_types.m4 @@ -1,4 +1,12 @@ -## Shamelessly copied from the DUNE sources under GPL version 2 +## Copyright (C) 1996-2014 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. +## + +## +## AX_CXX_TYPE_NULLPTR shamelessly copied from the DUNE sources under GPL version 2 ## AC_DEFUN([AX_CXX_TYPE_NULLPTR],[ AC_REQUIRE([AC_PROG_CXX]) diff --git a/acinclude/ax_cxx_compile_stdcxx_11.m4 b/acinclude/ax_cxx_compile_stdcxx_11.m4 index 163a4c646f..6be8c6a33d 100644 --- a/acinclude/ax_cxx_compile_stdcxx_11.m4 +++ b/acinclude/ax_cxx_compile_stdcxx_11.m4 @@ -1,3 +1,10 @@ +## Copyright (C) 1996-2014 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. +## + # ============================================================================ # http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html # ============================================================================ diff --git a/acinclude/ax_with_prog.m4 b/acinclude/ax_with_prog.m4 new file mode 100644 index 0000000000..49acc2047f --- /dev/null +++ b/acinclude/ax_with_prog.m4 @@ -0,0 +1,78 @@ +## Copyright (C) 1996-2014 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 =========================================================================== +dnl http://autoconf-archive.cryp.to/ax_with_prog.html +dnl =========================================================================== +dnl +dnl SYNOPSIS +dnl +dnl AX_WITH_PROG([VARIABLE],[program],[VALUE-IF-NOT-FOUND],[PATH]) +dnl +dnl DESCRIPTION +dnl +dnl Locates an installed program binary, placing the result in the precious +dnl variable VARIABLE. Accepts a present VARIABLE, then --with-program, and +dnl failing that searches for program in the given path (which defaults to +dnl the system path). If program is found, VARIABLE is set to the full path +dnl of the binary; if it is not found VARIABLE is set to VALUE-IF-NOT-FOUND +dnl if provided, unchanged otherwise. +dnl +dnl A typical example could be the following one: +dnl +dnl AX_WITH_PROG(PERL,perl) +dnl +dnl NOTE: This macro is based upon the original AX_WITH_PYTHON macro from +dnl Dustin J. Mitchell . +dnl +dnl LAST MODIFICATION +dnl +dnl 2008-05-05 +dnl +dnl COPYLEFT +dnl +dnl Copyright (c) 2008 Francesco Salvestrini +dnl Copyright (c) 2008 Dustin J. Mitchell +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. +dnl +AC_DEFUN([AX_WITH_PROG],[ + AC_PREREQ([2.61]) + + pushdef([VARIABLE],$1) + pushdef([EXECUTABLE],$2) + pushdef([VALUE_IF_NOT_FOUND],$3) + pushdef([PATH_PROG],$4) + + AC_ARG_VAR(VARIABLE,Absolute path to EXECUTABLE executable) + + AS_IF(test -z "$VARIABLE",[ + AC_MSG_CHECKING(whether EXECUTABLE executable path has been provided) + AC_ARG_WITH(EXECUTABLE,AS_HELP_STRING([--with-EXECUTABLE=[[[[PATH]]]]],absolute path to EXECUTABLE executable), [ + AS_IF([test "$withval" != "yes"],[ + VARIABLE="$withval" + AC_MSG_RESULT($VARIABLE) + ],[ + VARIABLE="" + AC_MSG_RESULT([no]) + ]) + ],[ + AC_MSG_RESULT([no]) + ]) + + AS_IF(test -z "$VARIABLE",[ + AC_PATH_PROG([]VARIABLE[],[]EXECUTABLE[],[]VALUE_IF_NOT_FOUND[],[]PATH_PROG[]) + ]) + ]) + + popdef([PATH_PROG]) + popdef([VALUE_IF_NOT_FOUND]) + popdef([EXECUTABLE]) + popdef([VARIABLE]) +]) diff --git a/acinclude/compiler-flags.m4 b/acinclude/compiler-flags.m4 index 7e611f3090..6b8184924c 100644 --- a/acinclude/compiler-flags.m4 +++ b/acinclude/compiler-flags.m4 @@ -1,31 +1,9 @@ -dnl -dnl AUTHOR: Francesco Chemolli -dnl -dnl SQUID Web Proxy Cache http://www.squid-cache.org/ -dnl ---------------------------------------------------------- -dnl Squid is the result of efforts by numerous individuals from -dnl the Internet community; see the CONTRIBUTORS file for full -dnl details. Many organizations have provided support for Squid's -dnl development; see the SPONSORS file for full details. Squid is -dnl Copyrighted (C) 2001 by the Regents of the University of -dnl California; see the COPYRIGHT file for full details. Squid -dnl incorporates software developed and/or copyrighted by other -dnl sources; see the CREDITS file for full details. -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, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU 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, USA. - +## Copyright (C) 1996-2014 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. +## # 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 a6ab31c353..4443b2be7d 100644 --- a/acinclude/init.m4 +++ b/acinclude/init.m4 @@ -1,3 +1,10 @@ +## Copyright (C) 1996-2014 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 This encapsulates the nasty mess of headers we need to check when dnl checking types. AC_DEFUN([SQUID_DEFAULT_INCLUDES],[[ @@ -60,75 +67,3 @@ SQUID_DEFAULT_INCLUDES #include #endif ]) - -dnl =========================================================================== -dnl http://autoconf-archive.cryp.to/ax_with_prog.html -dnl =========================================================================== -dnl -dnl SYNOPSIS -dnl -dnl AX_WITH_PROG([VARIABLE],[program],[VALUE-IF-NOT-FOUND],[PATH]) -dnl -dnl DESCRIPTION -dnl -dnl Locates an installed program binary, placing the result in the precious -dnl variable VARIABLE. Accepts a present VARIABLE, then --with-program, and -dnl failing that searches for program in the given path (which defaults to -dnl the system path). If program is found, VARIABLE is set to the full path -dnl of the binary; if it is not found VARIABLE is set to VALUE-IF-NOT-FOUND -dnl if provided, unchanged otherwise. -dnl -dnl A typical example could be the following one: -dnl -dnl AX_WITH_PROG(PERL,perl) -dnl -dnl NOTE: This macro is based upon the original AX_WITH_PYTHON macro from -dnl Dustin J. Mitchell . -dnl -dnl LAST MODIFICATION -dnl -dnl 2008-05-05 -dnl -dnl COPYLEFT -dnl -dnl Copyright (c) 2008 Francesco Salvestrini -dnl Copyright (c) 2008 Dustin J. Mitchell -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. -dnl -AC_DEFUN([AX_WITH_PROG],[ - AC_PREREQ([2.61]) - - pushdef([VARIABLE],$1) - pushdef([EXECUTABLE],$2) - pushdef([VALUE_IF_NOT_FOUND],$3) - pushdef([PATH_PROG],$4) - - AC_ARG_VAR(VARIABLE,Absolute path to EXECUTABLE executable) - - AS_IF(test -z "$VARIABLE",[ - AC_MSG_CHECKING(whether EXECUTABLE executable path has been provided) - AC_ARG_WITH(EXECUTABLE,AS_HELP_STRING([--with-EXECUTABLE=[[[[PATH]]]]],absolute path to EXECUTABLE executable), [ - AS_IF([test "$withval" != "yes"],[ - VARIABLE="$withval" - AC_MSG_RESULT($VARIABLE) - ],[ - VARIABLE="" - AC_MSG_RESULT([no]) - ]) - ],[ - AC_MSG_RESULT([no]) - ]) - - AS_IF(test -z "$VARIABLE",[ - AC_PATH_PROG([]VARIABLE[],[]EXECUTABLE[],[]VALUE_IF_NOT_FOUND[],[]PATH_PROG[]) - ]) - ]) - - popdef([PATH_PROG]) - popdef([VALUE_IF_NOT_FOUND]) - popdef([EXECUTABLE]) - popdef([VARIABLE]) -]) diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4 index 4f7434a6cc..e8545f9e71 100644 --- a/acinclude/krb5.m4 +++ b/acinclude/krb5.m4 @@ -1,30 +1,9 @@ -dnl -dnl AUTHOR: Squid Web Cache team -dnl -dnl SQUID Web Proxy Cache http://www.squid-cache.org/ -dnl ---------------------------------------------------------- -dnl Squid is the result of efforts by numerous individuals from -dnl the Internet community; see the CONTRIBUTORS file for full -dnl details. Many organizations have provided support for Squid's -dnl development; see the SPONSORS file for full details. Squid is -dnl Copyrighted (C) 2001 by the Regents of the University of -dnl California; see the COPYRIGHT file for full details. Squid -dnl incorporates software developed and/or copyrighted by other -dnl sources; see the CREDITS file for full details. -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, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU 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, USA. +## Copyright (C) 1996-2014 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 these checks must be performed in the same order as here defined, dnl and have mostly been lifted out of an inlined configure.ac. diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4 index 2bf98ee0aa..66aeb9c87a 100644 --- a/acinclude/lib-checks.m4 +++ b/acinclude/lib-checks.m4 @@ -1,31 +1,9 @@ -dnl -dnl AUTHOR: Squid Web Cache team -dnl -dnl SQUID Web Proxy Cache http://www.squid-cache.org/ -dnl ---------------------------------------------------------- -dnl Squid is the result of efforts by numerous individuals from -dnl the Internet community; see the CONTRIBUTORS file for full -dnl details. Many organizations have provided support for Squid's -dnl development; see the SPONSORS file for full details. Squid is -dnl Copyrighted (C) 2001 by the Regents of the University of -dnl California; see the COPYRIGHT file for full details. Squid -dnl incorporates software developed and/or copyrighted by other -dnl sources; see the CREDITS file for full details. -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, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU 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, USA. - +## Copyright (C) 1996-2014 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 checks whether dbopen needs -ldb to be added to libs dnl sets ac_cv_dbopen_libdb to either "yes" or "no" diff --git a/acinclude/os-deps.m4 b/acinclude/os-deps.m4 index 9690515008..14e5a583b3 100644 --- a/acinclude/os-deps.m4 +++ b/acinclude/os-deps.m4 @@ -1,31 +1,9 @@ -dnl -dnl AUTHOR: Squid Web Cache team -dnl -dnl SQUID Web Proxy Cache http://www.squid-cache.org/ -dnl ---------------------------------------------------------- -dnl Squid is the result of efforts by numerous individuals from -dnl the Internet community; see the CONTRIBUTORS file for full -dnl details. Many organizations have provided support for Squid's -dnl development; see the SPONSORS file for full details. Squid is -dnl Copyrighted (C) 2001 by the Regents of the University of -dnl California; see the COPYRIGHT file for full details. Squid -dnl incorporates software developed and/or copyrighted by other -dnl sources; see the CREDITS file for full details. -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, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU 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, USA. - +## Copyright (C) 1996-2014 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 check that strnstr() works fine. On Macos X it can cause a buffer overrun dnl sets squid_cv_func_strnstr to "yes" or "no", and defines HAVE_STRNSTR @@ -180,7 +158,7 @@ AC_DEFUN([SQUID_CHECK_FUNCTIONAL_LIBCAP2],[ ]) -dnl Ripped from Samba. Thanks! +dnl From Samba. Thanks! dnl check that we have Unix sockets. Sets squid_cv_unixsocket to either yes or no depending on the check AC_DEFUN([SQUID_CHECK_UNIX_SOCKET],[ diff --git a/acinclude/pam.m4 b/acinclude/pam.m4 index be6a3a1d9e..9ded9c6564 100644 --- a/acinclude/pam.m4 +++ b/acinclude/pam.m4 @@ -1,33 +1,9 @@ -dnl -dnl AUTHOR: Francesco Chemolli -dnl -dnl SQUID Web Proxy Cache http://www.squid-cache.org/ -dnl ---------------------------------------------------------- -dnl Squid is the result of efforts by numerous individuals from -dnl the Internet community; see the CONTRIBUTORS file for full -dnl details. Many organizations have provided support for Squid's -dnl development; see the SPONSORS file for full details. Squid is -dnl Copyrighted (C) 2001 by the Regents of the University of -dnl California; see the COPYRIGHT file for full details. Squid -dnl incorporates software developed and/or copyrighted by other -dnl sources; see the CREDITS file for full details. -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, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU 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, USA. - - - +## Copyright (C) 1996-2014 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 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 9bb3e068cf..950fb75b4e 100644 --- a/acinclude/pkg.m4 +++ b/acinclude/pkg.m4 @@ -1,3 +1,10 @@ +## Copyright (C) 1996-2014 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) # diff --git a/acinclude/squid-util.m4 b/acinclude/squid-util.m4 index b41f67b6ef..3ccd81f610 100644 --- a/acinclude/squid-util.m4 +++ b/acinclude/squid-util.m4 @@ -1,30 +1,9 @@ -dnl -dnl AUTHOR: Francesco Chemolli -dnl -dnl SQUID Web Proxy Cache http://www.squid-cache.org/ -dnl ---------------------------------------------------------- -dnl Squid is the result of efforts by numerous individuals from -dnl the Internet community; see the CONTRIBUTORS file for full -dnl details. Many organizations have provided support for Squid's -dnl development; see the SPONSORS file for full details. Squid is -dnl Copyrighted (C) 2001 by the Regents of the University of -dnl California; see the COPYRIGHT file for full details. Squid -dnl incorporates software developed and/or copyrighted by other -dnl sources; see the CREDITS file for full details. -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, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU 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, USA. +## Copyright (C) 1996-2014 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 save main environment variables to variables to the namespace defined by the dnl first argument (prefix) diff --git a/configure.ac b/configure.ac index d86bb95218..c3de582656 100644 --- a/configure.ac +++ b/configure.ac @@ -1,3 +1,10 @@ +## Copyright (C) 1996-2014 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. +## + AC_INIT([Squid Web Proxy],[3.HEAD-BZR],[http://bugs.squid-cache.org/],[squid]) AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) @@ -8,6 +15,7 @@ AC_REVISION($Revision$)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE +m4_include([acinclude/ax_with_prog.m4]) m4_include([acinclude/init.m4]) m4_include([acinclude/squid-util.m4]) m4_include([acinclude/compiler-flags.m4])