[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-772-gd583aa6

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=d583aa66634049d78dc6e04e1774bbb4fe437edc

The branch, master has been updated
       via  d583aa66634049d78dc6e04e1774bbb4fe437edc (commit)
       via  1cddf4107153300cfb0e321711ddb38eb0d7e96c (commit)
      from  eb70ceabcc97910c61a93f6597abb4fba60c1a17 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d583aa66634049d78dc6e04e1774bbb4fe437edc
Merge: eb70cea 1cddf41
Author: Stefano Lattarini <address@hidden>
Date:   Sun Apr 17 12:00:29 2011 +0200

    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.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |   14 ++++++++++++++
 m4/amversion.in  |    5 ++++-
 m4/amversion.m4  |    5 ++++-
 m4/auxdir.m4     |    4 +++-
 m4/gcj.m4        |    2 ++
 m4/install-sh.m4 |    2 ++
 m4/mkdirp.m4     |    5 ++++-
 m4/python.m4     |    2 ++
 m4/runlog.m4     |    4 +++-
 m4/strip.m4      |    4 +++-
 m4/upc.m4        |    4 +++-
 11 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6832fd1..e5caf81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-04-17  Stefano Lattarini  <address@hidden>
+
+       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  <address@hidden>
 
        tests: fix few bugs in self checks
diff --git a/m4/amversion.in b/m4/amversion.in
index 0ca73cf..cab5a3e 100644
--- a/m4/amversion.in
+++ b/m4/amversion.in
@@ -1,11 +1,14 @@
 ##                                                          -*- Autoconf -*-
 ## @configure_input@
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, 
Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 8
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index ff3a85e..79aefb9 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -1,11 +1,14 @@
 ##                                                          -*- Autoconf -*-
 ## Generated from amversion.in; do not edit by hand.
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, 
Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 8
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
diff --git a/m4/auxdir.m4 b/m4/auxdir.m4
index 091e3b7..4b810b0 100644
--- a/m4/auxdir.m4
+++ b/m4/auxdir.m4
@@ -1,11 +1,13 @@
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
diff --git a/m4/gcj.m4 b/m4/gcj.m4
index c53a1bf..76241bc 100644
--- a/m4/gcj.m4
+++ b/m4/gcj.m4
@@ -8,6 +8,8 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 8
+
 AC_DEFUN([AM_PROG_GCJ],
 [AC_CHECK_TOOLS([GCJ], [gcj], [gcj])
 test -z "$GCJ" && AC_MSG_ERROR([no acceptable gcj found in \$PATH])
diff --git a/m4/install-sh.m4 b/m4/install-sh.m4
index a9b81e0..60f1732 100644
--- a/m4/install-sh.m4
+++ b/m4/install-sh.m4
@@ -6,6 +6,8 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 8
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
diff --git a/m4/mkdirp.m4 b/m4/mkdirp.m4
index be8a9de..152d7fb 100644
--- a/m4/mkdirp.m4
+++ b/m4/mkdirp.m4
@@ -1,10 +1,13 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
diff --git a/m4/python.m4 b/m4/python.m4
index 4133823..a7c1dd7 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -10,6 +10,8 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 8
+
 # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 # ---------------------------------------------------------------------------
 # Adds support for distributing Python modules and packages.  To
diff --git a/m4/runlog.m4 b/m4/runlog.m4
index c3608fb..0bfd30d 100644
--- a/m4/runlog.m4
+++ b/m4/runlog.m4
@@ -1,10 +1,12 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_RUN_LOG(COMMAND)
 # -------------------
 # Run COMMAND, save the exit status in ac_status, and log it.
diff --git a/m4/strip.m4 b/m4/strip.m4
index 43435dc..e73f607 100644
--- a/m4/strip.m4
+++ b/m4/strip.m4
@@ -1,10 +1,12 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
diff --git a/m4/upc.m4 b/m4/upc.m4
index a819ea7..23a8c0b 100644
--- a/m4/upc.m4
+++ b/m4/upc.m4
@@ -1,11 +1,13 @@
 # Find a compiler for Unified Parallel C.                  -*- Autoconf -*-
 
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 AC_DEFUN([AM_PROG_UPC],
 [dnl We need OBJEXT and EXEEXT, but Autoconf doesn't offer any public
 dnl macro to compute them.  Use AC_PROG_CC instead.


hooks/post-receive
-- 
GNU Automake