[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.1-133-gebc92e1

[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=ebc92e19939b215d76804fde2e51a5850bcf23a0

The branch, master has been updated
       via  ebc92e19939b215d76804fde2e51a5850bcf23a0 (commit)
       via  0fcbd7c19e18265a4d2ca9f2158ec98daf4d67a9 (commit)
      from  78c4ba0d0799522c1cf0ad2ea666c100c609216c (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 ebc92e19939b215d76804fde2e51a5850bcf23a0
Merge: 78c4ba0 0fcbd7c
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jun 26 20:16:21 2012 +0200

    Merge branch 'missing-not-touch-just-warn'
    
    * missing-not-touch-just-warn:
      missing: --run is supported again (as a no-op) for use by older automake

commit 0fcbd7c19e18265a4d2ca9f2158ec98daf4d67a9
Author: Eric Blake <address@hidden>
Date:   Tue Jun 26 10:40:39 2012 -0600

    missing: --run is supported again (as a no-op) for use by older automake
    
    Commit v1.12.1-87-ga22717d of 2012-06-21 ("missing: do not touch
    timestamps; only warn for out-of-date files") has removed the '--run'
    option, since our new preferred calling conventions now imply it; but
    if a newer 'missing' is mixed with an already built project that used
    an older Automake version (this happened in practice for GNU m4; see:
    <http://lists.gnu.org/archive/html/bug-m4/2012-06/msg00001.html>), then
    the 'Makefile' in that project will fail due to passing the '--run'
    option when trying to bring the project up-to-date.
    
    * lib/missing: Parse and ignore '--run'.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 lib/missing |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/lib/missing b/lib/missing
index 86301c4..dab67a8 100755
--- a/lib/missing
+++ b/lib/missing
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-06-25.09; # UTC
+scriptversion=2012-06-26.16; # UTC
 
 # Copyright (C) 1996-2012 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <address@hidden>, 1996.
@@ -37,6 +37,11 @@ case $1 in
     exit 0
     ;;
 
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...


hooks/post-receive
-- 
GNU Automake