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.

diff --cc ChangeLog
index 6832fd1b12e4f99716932022c3a62373b22986e7,ee6319d1e5865c8ceb897f6cc6690ab7eb54a7f2..e5caf813ac4d7adeaef5576e055235f3ccd710ca
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,17 +1,28 @@@
 -      Related to automake bug#8483.
+ 2011-04-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       m4: add missing serial numbers to a few files
++      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 0ca73cfd9346b3850ee9c3d824658ae0f727e8f0,61a86abfbf264043a042a7c38a159024f313703b..cab5a3e7ed2c3a4daad7414d2db9a4472f7a231a
--- 1/m4/amversion.in
--- 2/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 ff3a85e6d1f69806532118145f4d1f2320279679,9fd3c1e0cdffa37af12df8f2033c0c76a71d1eb1..79aefb988aca5fb5ceae57af5bba305ef02044e6
--- 1/m4/amversion.m4
--- 2/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 c53a1bfc631a6347555fcee47b0fc4e8301bcfae,49dbe1f1ffc2a7c8f8f83dbc6843935b82272af3..76241bc535e48d5ceba161ec791fdecb9ac8e2d1
--- 1/m4/gcj.m4
--- 2/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 a9b81e0c760ee826db2cd1a6abcb14b74ac93ff9,20d71c65228f114381fe5212d2e03a074dce0950..60f17323f6dc39dac26eb7616857563977001130
--- 1/m4/install-sh.m4
--- 2/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 41338238088dd6ed238f4c8accfeac6d1e613ced,89f2dfb481bc569ee45e10b88541584b125bdfce..a7c1dd76ee494d7559e63ec32adc748d911c1872
--- 1/m4/python.m4
--- 2/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