]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 12 Jan 2013 12:54:43 +0000 (13:54 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 12 Jan 2013 12:54:43 +0000 (13:54 +0100)
* 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>
1  2 
bootstrap.sh
configure.ac
t/list-of-tests.mk
t/subobj11a.sh

diff --cc bootstrap.sh
index 7704fc11e9762a556306a3aa55b82522764a6581,93bf3fd541547df5d158349f6762ff563e130fdd..bb4221d01563dd23f4ee6056e24426f4de4aa03a
@@@ -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 configure.ac
Simple merge
index 1bcc2a55deaead9f64efb44758b326500b4da372,a6e1ceeb4d77c2fa70443acde66b8ccd367b3753..5cda804e86550aa51844a34dcf2bb65554c36776
@@@ -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 \
diff --cc t/subobj11a.sh
Simple merge