mirror of
git://git.sv.gnu.org/autoconf
synced 2025-02-23 14:09:51 +08:00
Fix years in copyright notices.
* lib/m4sugar/m4sugar.m4 (m4_copyright_condense): New macro, undocumented for now. * lib/m4sugar/Makefile.am (version.m4): Add m4_PACKAGE_YEAR, m4_PACKAGE_URL. (RELEASE_YEAR): New macro, copied from bin/Makefile.am. * lib/autoconf/general.m4 (_AC_COPYRIGHT_YEARS): New macro. (AC_COPYRIGHT): Add undocumented third parameter. (_AC_INIT_COPYRIGHT): Avoid need to bump copyright years. * lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Likewise. * lib/autotest/general.m4 (AT_INIT): Likewise. * lib/autoconf/autotest.m4 (AC_CONFIG_TESTDIR): Likewise. (AT_COPYRIGHT): Add undocumented third parameter. * tests/local.at (AT_COPYRIGHT): Don't add an extra copyright parameter; the generic copyright given by autotest is sufficient since we are the package that owns autotest. Signed-off-by: Eric Blake <ebb9@byu.net>
This commit is contained in:
Eric Blake
parent
758f763ddf
commit
65c175502a
19
ChangeLog
19
ChangeLog
@ -1,3 +1,22 @@
|
||||
2009-01-28 Eric Blake <ebb9@byu.net>
|
||||
|
||||
Fix years in copyright notices.
|
||||
* lib/m4sugar/m4sugar.m4 (m4_copyright_condense): New macro,
|
||||
undocumented for now.
|
||||
* lib/m4sugar/Makefile.am (version.m4): Add m4_PACKAGE_YEAR,
|
||||
m4_PACKAGE_URL.
|
||||
(RELEASE_YEAR): New macro, copied from bin/Makefile.am.
|
||||
* lib/autoconf/general.m4 (_AC_COPYRIGHT_YEARS): New macro.
|
||||
(AC_COPYRIGHT): Add undocumented third parameter.
|
||||
(_AC_INIT_COPYRIGHT): Avoid need to bump copyright years.
|
||||
* lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Likewise.
|
||||
* lib/autotest/general.m4 (AT_INIT): Likewise.
|
||||
* lib/autoconf/autotest.m4 (AC_CONFIG_TESTDIR): Likewise.
|
||||
(AT_COPYRIGHT): Add undocumented third parameter.
|
||||
* tests/local.at (AT_COPYRIGHT): Don't add an extra copyright
|
||||
parameter; the generic copyright given by autotest is sufficient
|
||||
since we are the package that owns autotest.
|
||||
|
||||
2009-01-27 Eric Blake <ebb9@byu.net>
|
||||
|
||||
Use URLs in --help output, part 3: testsuite.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This file is part of Autoconf. -*- Autoconf -*-
|
||||
# Interface with Autotest.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002,
|
||||
# 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||
# 2002, 2003, 2004, 2005, 2009 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
|
||||
@ -66,7 +66,7 @@ AC_DEFUN([AC_CONFIG_TESTDIR],
|
||||
[cat >$1/atconfig <<ATEOF
|
||||
@%:@ Configurable variable values for building test suites.
|
||||
@%:@ Generated by $[0].
|
||||
@%:@ Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
|
||||
@%:@ Copyright (C) m4_PACKAGE_YEAR Free Software Foundation, Inc.
|
||||
|
||||
# The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
|
||||
at_testdir='$1'
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
# This file is part of Autoconf. -*- Autoconf -*-
|
||||
# Parameterized macros.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||
# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
|
||||
# Foundation, Inc.
|
||||
m4_define([_AC_COPYRIGHT_YEARS],
|
||||
[Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||
2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 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
|
||||
@ -275,16 +276,17 @@ m4_ifndef([AC_PACKAGE_URL],
|
||||
])
|
||||
|
||||
|
||||
# AC_COPYRIGHT(TEXT, [VERSION-DIVERSION = VERSION_USER])
|
||||
# AC_COPYRIGHT(TEXT, [VERSION-DIVERSION = VERSION_USER],
|
||||
# [FILTER = m4_newline])
|
||||
# ------------------------------------------------------
|
||||
# Emit TEXT, a copyright notice, in the top of `configure' and in
|
||||
# --version output. Macros in TEXT are evaluated once.
|
||||
# --version output. Macros in TEXT are evaluated once. Process
|
||||
# the --version output through FILTER (m4_newline, m4_do, and
|
||||
# m4_copyright_condense are common filters).
|
||||
m4_define([AC_COPYRIGHT],
|
||||
[AS_COPYRIGHT([$1])[]dnl
|
||||
m4_divert_text(m4_default([$2], [VERSION_USER]),
|
||||
[
|
||||
$1])dnl
|
||||
])# AC_COPYRIGHT
|
||||
[AS_COPYRIGHT([$1])[]]dnl
|
||||
[m4_divert_text(m4_default_quoted([$2], [VERSION_USER]),
|
||||
[m4_default([$3], [m4_newline])([$1])])])# AC_COPYRIGHT
|
||||
|
||||
|
||||
# AC_REVISION(REVISION-INFO)
|
||||
@ -368,14 +370,12 @@ m4_ifset([AC_PACKAGE_BUGREPORT],
|
||||
# We dump to VERSION_FSF to make sure we are inserted before the
|
||||
# user copyrights, and after the setup of the --version handling.
|
||||
m4_define([_AC_INIT_COPYRIGHT],
|
||||
[AC_COPYRIGHT(
|
||||
[Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||
2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
|
||||
Foundation, Inc.
|
||||
This configure script is free software; the Free Software Foundation
|
||||
[AC_COPYRIGHT(m4_defn([_AC_COPYRIGHT_YEARS]), [VERSION_FSF], [
|
||||
m4_copyright_condense])dnl
|
||||
AC_COPYRIGHT(
|
||||
[This configure script is free software; the Free Software Foundation
|
||||
gives unlimited permission to copy, distribute and modify it.],
|
||||
[VERSION_FSF])dnl
|
||||
])
|
||||
[VERSION_FSF], [m4_echo])])
|
||||
|
||||
|
||||
# File Descriptors
|
||||
|
||||
@ -1444,7 +1444,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
|
||||
configured by $[0], generated by m4_PACKAGE_STRING,
|
||||
with options \\"`AS_ECHO(["$ac_configure_args"]) | sed 's/^ //; s/[[\\""\`\$]]/\\\\&/g'`\\"
|
||||
|
||||
Copyright (C) 2009 Free Software Foundation, Inc.
|
||||
Copyright (C) m4_PACKAGE_YEAR Free Software Foundation, Inc.
|
||||
This config.status script is free software; the Free Software Foundation
|
||||
gives unlimited permission to copy, distribute and modify it."
|
||||
|
||||
|
||||
@ -224,10 +224,12 @@ dnl This trick removes that banner, since it adds nothing to autotest.
|
||||
[m4_cleardivert([BODY])]dnl
|
||||
[AS_ME_PREPARE[]]dnl
|
||||
[m4_divert_push([DEFAULTS])]dnl
|
||||
[AT_COPYRIGHT(m4_defn([_AT_COPYRIGHT_YEARS])[
|
||||
This test suite is free software; the Free Software Foundation gives
|
||||
unlimited permission to copy, distribute and modify it.])
|
||||
AS_PREPARE
|
||||
[AT_COPYRIGHT(m4_defn([_AT_COPYRIGHT_YEARS]), [
|
||||
m4_copyright_condense])]
|
||||
[AT_COPYRIGHT(
|
||||
[This test suite is free software; the Free Software Foundation gives
|
||||
unlimited permission to copy, distribute and modify it.], [m4_echo])]
|
||||
[AS_PREPARE
|
||||
|
||||
SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
|
||||
@ -1717,15 +1719,16 @@ m4_define([AT_TESTED],
|
||||
[m4_append_uniq_w([AT_tested], [$1])])
|
||||
|
||||
|
||||
# AT_COPYRIGHT(TEXT)
|
||||
# ------------------
|
||||
# AT_COPYRIGHT(TEXT, [FILTER = m4_newline])
|
||||
# -----------------------------------------
|
||||
# Emit TEXT, a copyright notice, in the top of the test suite and in
|
||||
# --version output. Macros in TEXT are evaluated once.
|
||||
# --version output. Macros in TEXT are evaluated once. Process
|
||||
# the --version output through FILTER (m4_newline, m4_do, and
|
||||
# m4_copyright_condense are common filters).
|
||||
m4_define([AT_COPYRIGHT],
|
||||
[AS_COPYRIGHT([$1])[]dnl
|
||||
m4_divert_text([VERSION_NOTICES],
|
||||
[
|
||||
$1])])# AT_COPYRIGHT
|
||||
[AS_COPYRIGHT([$1])[]]dnl
|
||||
[m4_divert_text([VERSION_NOTICES],
|
||||
[m4_default([$2], [m4_newline])([$1])])])# AT_COPYRIGHT
|
||||
|
||||
|
||||
# AT_SETUP(DESCRIPTION)
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
# Make Autoconf library for M4sugar.
|
||||
|
||||
# Copyright (C) 2001, 2002, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2001, 2002, 2006, 2007, 2008, 2009 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
|
||||
@ -20,6 +21,10 @@ dist_m4sugarlib_DATA = m4sugar.m4 foreach.m4 m4sh.m4
|
||||
nodist_m4sugarlib_DATA = version.m4 m4sugar.m4f m4sh.m4f
|
||||
CLEANFILES = $(nodist_m4sugarlib_DATA)
|
||||
|
||||
# Get the release year from ../ChangeLog.
|
||||
RELEASE_YEAR = \
|
||||
`sed 's/^\([0-9][0-9][0-9][0-9]\).*/\1/;q' $(top_srcdir)/ChangeLog`
|
||||
|
||||
## ------------ ##
|
||||
## version.m4. ##
|
||||
## ------------ ##
|
||||
@ -29,14 +34,16 @@ version.m4: Makefile
|
||||
:;{ \
|
||||
echo '# This file is part of -*- Autoconf -*-.' && \
|
||||
echo '# Version of Autoconf.' && \
|
||||
echo '# Copyright (C) 1999, 2000, 2001, 2002, 2006, 2007' && \
|
||||
echo '# Copyright (C) 1999, 2000, 2001, 2002, 2006, 2007, 2009' && \
|
||||
echo '# Free Software Foundation, Inc.' && \
|
||||
echo &&\
|
||||
echo 'm4_define([m4_PACKAGE_NAME], [$(PACKAGE_NAME)])' && \
|
||||
echo 'm4_define([m4_PACKAGE_TARNAME], [$(PACKAGE_TARNAME)])' && \
|
||||
echo 'm4_define([m4_PACKAGE_VERSION], [$(PACKAGE_VERSION)])' && \
|
||||
echo 'm4_define([m4_PACKAGE_STRING], [$(PACKAGE_STRING)])' && \
|
||||
echo 'm4_define([m4_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \
|
||||
echo 'm4_define([m4_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])' && \
|
||||
echo 'm4_define([m4_PACKAGE_URL], [$(PACKAGE_URL)])' && \
|
||||
echo 'm4_define([m4_PACKAGE_YEAR], ['$(RELEASE_YEAR)'])'; \
|
||||
} > $@-t
|
||||
mv $@-t $@
|
||||
|
||||
|
||||
@ -2587,6 +2587,13 @@ m4_if(m4_index([$1], [@]), [-1], [m4_len([$1])],
|
||||
[@\(\(<:\|:>\|S|\|%:\|\{:\|:\}\)\(@\)\|&t@\)],
|
||||
[\3]))]))_m4_defn([m4_qlen-$1])])
|
||||
|
||||
# m4_copyright_condense(TEXT)
|
||||
# ---------------------------
|
||||
# Condense the copyright notice in TEXT to only display the final
|
||||
# year, wrapping the results to fit in 80 columns.
|
||||
m4_define([m4_copyright_condense],
|
||||
[m4_text_wrap(m4_bpatsubst(m4_flatten([[$1]]),
|
||||
[(C)[- ,0-9]*\([1-9][0-9][0-9][0-9]\)], [(C) \1]))])
|
||||
|
||||
## ----------------------- ##
|
||||
## 13. Number processing. ##
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# M4 macros used in building Autoconf test suites. -*- Autotest -*-
|
||||
|
||||
# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||
# Free Software Foundation, Inc.
|
||||
# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
|
||||
# 2009 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
|
||||
@ -521,8 +521,3 @@ AT_CLEANUP[]dnl
|
||||
## ----------------------- ##
|
||||
|
||||
AT_INIT
|
||||
AT_COPYRIGHT(
|
||||
[Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||
Free Software Foundation, Inc.
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.])
|
||||
|
||||
Loading…
Reference in New Issue
Block a user