From: Eric Blake Date: Thu, 4 Jan 2007 16:43:06 +0000 (+0000) Subject: * bin/Makefile.am (RELEASE_YEAR): New macro. X-Git-Tag: v2.62~375 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c78eaa47a912549f3bb9558bfce279bf9c7c4366;p=thirdparty%2Fautoconf.git * bin/Makefile.am (RELEASE_YEAR): New macro. (edit): Use it to supply correct copyright year to scripts. * bin/autoconf.as (version): Use it. * bin/autoheader.in ($version): Likewise. * bin/autom4te.in ($version): Likewise. * bin/autoreconf.in ($version): Likewise. * bin/autoscan.in ($version): Likewise. * bin/autoupdate.in ($version): Likewise. * bin/ifnames.in ($version): Likewise. --- diff --git a/ChangeLog b/ChangeLog index d52bd76b..b35e40a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-01-04 Eric Blake + + * bin/Makefile.am (RELEASE_YEAR): New macro. + (edit): Use it to supply correct copyright year to scripts. + * bin/autoconf.as (version): Use it. + * bin/autoheader.in ($version): Likewise. + * bin/autom4te.in ($version): Likewise. + * bin/autoreconf.in ($version): Likewise. + * bin/autoscan.in ($version): Likewise. + * bin/autoupdate.in ($version): Likewise. + * bin/ifnames.in ($version): Likewise. + 2007-01-02 Paul Eggert * doc/autoconf.texi (Integer Overflow): Revised based on today's diff --git a/bin/Makefile.am b/bin/Makefile.am index 26d35299..92d3baed 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,6 +1,6 @@ # Make Autoconf commands. -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free # Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -29,6 +29,9 @@ EXTRA_DIST = autoconf.as autoheader.in autoreconf.in autoupdate.in ifnames.in \ # Files that should be removed, but which Automake does not know. MOSTLYCLEANFILES = $(bin_SCRIPTS) autoconf.in *.tmp +# Get the release year from ../ChangeLog. +RELEASE_YEAR = \ + `sed 's/^\([0-9][0-9][0-9][0-9]\).*/\1/;q' $(top_srcdir)/ChangeLog` ## ------------- ## ## The scripts. ## @@ -46,6 +49,7 @@ edit = sed \ -e 's|@M4[@]|$(M4)|g' \ -e 's|@M4_DEBUGFILE[@]|$(M4_DEBUGFILE)|g' \ -e 's|@AWK[@]|$(AWK)|g' \ + -e 's|@RELEASE_YEAR[@]|'$(RELEASE_YEAR)'|g' \ -e 's|@VERSION[@]|$(VERSION)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ -e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g' diff --git a/bin/Makefile.in b/bin/Makefile.in index 6401c0ee..733ef11b 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -16,7 +16,7 @@ # Make Autoconf commands. -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free # Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -246,6 +246,11 @@ EXTRA_DIST = autoconf.as autoheader.in autoreconf.in autoupdate.in ifnames.in \ # Files that should be removed, but which Automake does not know. MOSTLYCLEANFILES = $(bin_SCRIPTS) autoconf.in *.tmp + +# Get the release year from ../ChangeLog. +RELEASE_YEAR = \ + `sed 's/^\([0-9][0-9][0-9][0-9]\).*/\1/;q' $(top_srcdir)/ChangeLog` + edit = sed \ -e 's|@SHELL[@]|$(SHELL)|g' \ -e 's|@PERL[@]|$(PERL)|g' \ @@ -258,6 +263,7 @@ edit = sed \ -e 's|@M4[@]|$(M4)|g' \ -e 's|@M4_DEBUGFILE[@]|$(M4_DEBUGFILE)|g' \ -e 's|@AWK[@]|$(AWK)|g' \ + -e 's|@RELEASE_YEAR[@]|'$(RELEASE_YEAR)'|g' \ -e 's|@VERSION[@]|$(VERSION)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ -e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g' diff --git a/bin/autoconf.as b/bin/autoconf.as index f5c08245..bf04f5fe 100644 --- a/bin/autoconf.as +++ b/bin/autoconf.as @@ -2,7 +2,7 @@ AS_INIT[]dnl -*- shell-script -*- # autoconf -- create `configure' using m4 macros # Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003, -# 2004, 2005, 2006 Free Software Foundation, Inc. +# 2004, 2005, 2006, 2007 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 @@ -61,7 +61,7 @@ Report bugs to ."] version=["\ autoconf (@PACKAGE_NAME@) @VERSION@ -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) @RELEASE_YEAR@ Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. diff --git a/bin/autoheader.in b/bin/autoheader.in index 5bd1e2c3..9fec8277 100644 --- a/bin/autoheader.in +++ b/bin/autoheader.in @@ -8,7 +8,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' # autoheader -- create `config.h.in' from `configure.ac' # Copyright (C) 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007 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 @@ -87,7 +87,7 @@ Report bugs to . # $VERSION # -------- $version = "autoheader (@PACKAGE_NAME@) @VERSION@ -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) @RELEASE_YEAR@ Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. diff --git a/bin/autom4te.in b/bin/autom4te.in index 77d7ef7d..5c5af936 100644 --- a/bin/autom4te.in +++ b/bin/autom4te.in @@ -6,7 +6,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' if 0; # autom4te - Wrapper around M4 libraries. -# Copyright (C) 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007 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 @@ -211,7 +212,7 @@ Report bugs to . # -------- $version = <<"EOF"; autom4te (@PACKAGE_NAME@) @VERSION@ -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) @RELEASE_YEAR@ Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. diff --git a/bin/autoreconf.in b/bin/autoreconf.in index c063987a..86d50840 100644 --- a/bin/autoreconf.in +++ b/bin/autoreconf.in @@ -6,7 +6,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' if 0; # autoreconf - install the GNU Build System in a directory tree -# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -97,7 +97,7 @@ Report bugs to . # $VERSION # -------- $version = "autoreconf (@PACKAGE_NAME@) @VERSION@ -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) @RELEASE_YEAR@ Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. diff --git a/bin/autoscan.in b/bin/autoscan.in index 890108c5..fd657eab 100644 --- a/bin/autoscan.in +++ b/bin/autoscan.in @@ -3,7 +3,7 @@ # @configure_input@ # autoscan - Create configure.scan (a preliminary configure.ac) for a package. -# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -123,7 +123,7 @@ Report bugs to .\n"; # $version # -------- $version = "autoscan (@PACKAGE_NAME@) @VERSION@ -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) @RELEASE_YEAR@ Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. diff --git a/bin/autoupdate.in b/bin/autoupdate.in index 5eaa9f88..08c54295 100644 --- a/bin/autoupdate.in +++ b/bin/autoupdate.in @@ -3,7 +3,7 @@ # @configure_input@ # autoupdate - modernize an Autoconf file. -# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,7 @@ Report bugs to . # $VERSION # -------- $version = "autoupdate (@PACKAGE_NAME@) @VERSION@ -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) @RELEASE_YEAR@ Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. diff --git a/bin/ifnames.in b/bin/ifnames.in index 1302337a..3587cf3a 100644 --- a/bin/ifnames.in +++ b/bin/ifnames.in @@ -7,7 +7,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' # ifnames - print the identifiers used in C preprocessor conditionals -# Copyright (C) 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2005, 2006 +# Copyright (C) 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -66,7 +66,7 @@ Report bugs to . # $VERSION # -------- $version = "ifnames (@PACKAGE_NAME@) @VERSION@ -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) @RELEASE_YEAR@ Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. diff --git a/configure b/configure index 71e3b486..815d687d 100755 --- a/configure +++ b/configure @@ -799,10 +799,11 @@ do expr "x$ac_useropt" : ".*[^-._$as_cr_alnum]" >/dev/null && { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 { (exit 1); exit 1; }; } + ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-.]/_/g'` case $ac_user_opts in *:enable_$ac_useropt:*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt" + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" ac_unrecognized_sep=', ';; esac eval enable_$ac_useropt=no ;; @@ -823,10 +824,11 @@ do expr "x$ac_useropt" : ".*[^-._$as_cr_alnum]" >/dev/null && { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 { (exit 1); exit 1; }; } + ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-.]/_/g'` case $ac_user_opts in *:enable_$ac_useropt:*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt" + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" ac_unrecognized_sep=', ';; esac eval enable_$ac_useropt=\$ac_optarg ;; @@ -1025,10 +1027,11 @@ do expr "x$ac_useropt" : ".*[^-._$as_cr_alnum]" >/dev/null && { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 { (exit 1); exit 1; }; } + ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-.]/_/g'` case $ac_user_opts in *:with_$ac_useropt:*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt" + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" ac_unrecognized_sep=', ';; esac eval with_$ac_useropt=\$ac_optarg ;; @@ -1039,10 +1042,11 @@ do expr "x$ac_useropt" : ".*[^-._$as_cr_alnum]" >/dev/null && { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 { (exit 1); exit 1; }; } + ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-.]/_/g'` case $ac_user_opts in *:with_$ac_useropt:*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt" + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" ac_unrecognized_sep=', ';; esac eval with_$ac_useropt=no ;; @@ -3497,7 +3501,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - set X '$SHELL' '$0'$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL'