From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 24 Jun 2012 08:56:46 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51403a69dfa4884614465c5f3190158a91844682;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  tests: fix automatic re-execution of tests with Zsh
  tests: drop support for older Zsh shells
  tests: allow AM_TEST_RUNNER_SHELL to be overridden
  tests: fix setup for older Zsh
  missing: do not touch timestamps; only warn for out-of-date files

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

51403a69dfa4884614465c5f3190158a91844682
diff --cc doc/automake-ng.texi
index 805957144,73dceabb8..9626b1a77
--- a/doc/automake-ng.texi
+++ b/doc/automake-ng.texi
@@@ -2306,10 -2294,20 +2306,10 @@@ a file and prints some date informatio
  
  @item missing
  This wraps a number of programs that are typically only required by
- maintainers.  If the program in question doesn't exist,
- @command{missing} prints an informative warning and attempts to fix
- things so that the build can continue.
+ maintainers.  If the program in question doesn't exist, or seems to old,
+ @command{missing} will print an informative warning before failing out,
+ to provide the user with more context and information.
  
 -@item mkinstalldirs
 -This script used to be a wrapper around @samp{mkdir -p}, which is not
 -portable.  Now we prefer to use @samp{install-sh -d} when @command{configure}
 -finds that @samp{mkdir -p} does not work, this makes one less script to
 -distribute.
 -
 -For backward compatibility @file{mkinstalldirs} is still used and
 -distributed when @command{automake} finds it in a package.  But it is no
 -longer installed automatically, and it should be safe to remove it.
 -
  @item py-compile
  This is used to byte-compile Python scripts.
  
diff --cc lib/missing
index be44a62b1,06e0af1d7..a65c9b6c7
--- a/lib/missing
+++ b/lib/missing
@@@ -1,10 -1,10 +1,10 @@@
  #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
+ # Common wrapper for a few potentially missing GNU programs.
  
- scriptversion=2012-06-02.10; # UTC
 -scriptversion=2012-06-14.10; # UTC
++scriptversion=2012-06-24.10; # UTC
  
  # Copyright (C) 1996-2012 Free Software Foundation, Inc.
- # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+ # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
@@@ -29,30 -29,21 +29,15 @@@ if test $# -eq 0; the
    exit 1
  fi
  
- run=:
- sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
- sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
- 
 -# In the cases where this matters, 'missing' is being run in the
 -# srcdir already.
 -if test -f configure.ac; then
 -  configure_ac=configure.ac
 -else
 -  configure_ac=configure.in
 -fi
 +configure_ac=configure.ac
  
- msg="missing on your system"
- 
  case $1 in
- --run)
-   # Try to run requested program, and just exit if it succeeds.
-   run=
-   shift
-   "$@" && exit 0
-   # Exit code 63 means version mismatch.  This often happens
-   # when the user try to use an ancient version of a tool on
-   # a file that requires a minimum version.  In this case we
-   # we should proceed has if the program had been absent, or
-   # if --run hadn't been passed.
-   if test $? = 63; then
-     run=:
-     msg="probably too old"
-   fi
-   ;;
+ 
+   --is-lightweight)
+     # Used by our autoconf macros to check whether the available missing
+     # script is modern enough.
+     exit 0
+     ;;
  
    -h|--h|--he|--hel|--help)
      echo "\