From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 17 Apr 2011 10:00:29 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~203
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d583aa66634049d78dc6e04e1774bbb4fe437edc;p=thirdparty%2Fautomake.git

Merge branch 'maint'

The following additional changes has been made:
* m4/amversion.in: Bump serial number from `1' to `8', to avoid
potential future conflicts with branch-1.11.
* m4/amversion.m4: Likewise.
* m4/gcj.m4: Likewise.
* m4/python.m4: Likewise.
* m4/install-sh.m4: Likewise.
---

d583aa66634049d78dc6e04e1774bbb4fe437edc
diff --cc ChangeLog
index 6832fd1b1,ee6319d1e..e5caf813a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,17 +1,28 @@@
+ 2011-04-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	m4: add missing serial numbers to a few files
 -	Related to automake bug#8483.
++	Fixes automake bug#8483.
+ 	* m4/amversion.in: Add serial number.
+ 	* m4/auxdir.m4: Likewise.
+ 	* m4/gcj.m4: Likewise.
+ 	* m4/install-sh.m4: Likewise.
+ 	* m4/mkdirp.m4: Likewise.
+ 	* m4/python.m4: Likewise.
+ 	* m4/runlog.m4: Likewise.
+ 	* m4/strip.m4: Likewise.
+ 	* m4/upc.m4: Likewise.
+ 
 +2011-04-16  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	tests: fix few bugs in self checks
 +	Related to automake bug#8508.
 +	* tests/self-check-cleanup.test: Be laxer when grepping output
 +	from `ls -l', to account for ACLs and SELinux-only files.
 +	* tests/self-check-dir.test: Source `defs-static' to read in the
 +	correct definition for $SHELL.
 +	* tests/self-check-me.test: Likewise, and extend a bit.
 +	Report from Jim Meyering.
 +
  2011-04-16  Jim Meyering  <meyering@redhat.com>
  
  	depcomp: correct invalid sed invocation
diff --cc m4/amversion.in
index 0ca73cfd9,61a86abfb..cab5a3e7e
--- a/m4/amversion.in
+++ b/m4/amversion.in
@@@ -6,6 -7,8 +7,8 @@@
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
  
 -# serial 1
++# serial 8
+ 
  # AM_AUTOMAKE_VERSION(VERSION)
  # ----------------------------
  # Automake X.Y traces this macro to ensure aclocal.m4 has been
diff --cc m4/amversion.m4
index ff3a85e6d,9fd3c1e0c..79aefb988
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@@ -6,6 -7,8 +7,8 @@@
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
  
 -# serial 1
++# serial 8
+ 
  # AM_AUTOMAKE_VERSION(VERSION)
  # ----------------------------
  # Automake X.Y traces this macro to ensure aclocal.m4 has been
diff --cc m4/gcj.m4
index c53a1bfc6,49dbe1f1f..76241bc53
--- a/m4/gcj.m4
+++ b/m4/gcj.m4
@@@ -8,8 -8,10 +8,10 @@@
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
  
 -# serial 1
++# serial 8
+ 
 -AC_DEFUN([AM_PROG_GCJ],[
 -AC_CHECK_TOOLS(GCJ, gcj, gcj)
 +AC_DEFUN([AM_PROG_GCJ],
 +[AC_CHECK_TOOLS([GCJ], [gcj], [gcj])
  test -z "$GCJ" && AC_MSG_ERROR([no acceptable gcj found in \$PATH])
  if test "x${GCJFLAGS-unset}" = xunset; then
     GCJFLAGS="-g -O2"
diff --cc m4/install-sh.m4
index a9b81e0c7,20d71c652..60f17323f
--- a/m4/install-sh.m4
+++ b/m4/install-sh.m4
@@@ -6,6 -6,8 +6,8 @@@
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
  
 -# serial 1
++# serial 8
+ 
  # AM_PROG_INSTALL_SH
  # ------------------
  # Define $install_sh.
diff --cc m4/python.m4
index 413382380,89f2dfb48..a7c1dd76e
--- a/m4/python.m4
+++ b/m4/python.m4
@@@ -10,6 -10,8 +10,8 @@@
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
  
 -# serial 1
++# serial 8
+ 
  # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
  # ---------------------------------------------------------------------------
  # Adds support for distributing Python modules and packages.  To