From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 12 Jan 2013 12:54:43 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v1.16~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84d77cd6e35f66a6bfd5b41a39bb8c2a4f909b6f;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  tests: remove most uses of the AM_PROG_CC_C_O obsolete macro
  coverage: obsolete macro AM_PROG_CC_C_O should cause no warning nor errors
  INSTALL: update copyright years
  ithreads: use runtime (not configure time) detection of perl threads
  copyright: add few missing copyright notices
  maint: files in PLANS are to be exempted from copyright notice
  maint: consistently honor the UPDATE_COPYRIGHT_YEAR environment variable
  copyright: update some copyright years

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

84d77cd6e35f66a6bfd5b41a39bb8c2a4f909b6f
diff --cc bootstrap.sh
index 7704fc11e,93bf3fd54..bb4221d01
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@@ -37,11 -35,19 +37,10 @@@ BOOTSTRAP_SHELL=${BOOTSTRAP_SHELL-/bin/
  VERSION=`sed -ne '/AC_INIT/s/^[^[]*\[[^[]*\[\([^]]*\)\].*$/\1/p' configure.ac`
  PACKAGE=automake
  datadir=.
- PERL_THREADS=0
  # This should be automatically updated by the 'update-copyright'
  # rule of our Makefile.
- RELEASE_YEAR=2012
+ RELEASE_YEAR=2013
  
 -# Override SHELL.  This is required on DJGPP so that Perl's system()
 -# uses bash, not COMMAND.COM which doesn't quote arguments properly.
 -# It's not used otherwise.
 -if test -n "$DJDIR"; then
 -  BOOTSTRAP_SHELL=/dev/env/DJDIR/bin/bash.exe
 -else
 -  BOOTSTRAP_SHELL=/bin/sh
 -fi
 -
  # Read the rule for calculating APIVERSION and execute it.
  apiver_cmd=`sed -ne 's/\[\[/[/g;s/\]\]/]/g;/^APIVERSION=/p' configure.ac`
  eval "$apiver_cmd"
diff --cc t/list-of-tests.mk
index 1bcc2a55d,a6e1ceeb4..5cda804e8
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@@ -131,8 -131,8 +131,9 @@@ t/amhello-binpkg.sh 
  t/aminit-moreargs-deprecation.sh \
  t/amassign.sh \
  t/am-config-header-no-more.sh \
 -t/am-prog-cc-stdc-no-more.sh \
+ t/am-prog-cc-c-o.sh \
 +t/am-prog-cc-stdc-no-more.sh \
 +t/am-prog-mkdir-p-no-more.sh \
  t/am-macro-not-found.sh \
  t/amopt.sh \
  t/amopts-location.sh \