From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 28 Jun 2012 08:59:45 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v1.12b~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27478539b094a2b0bee4f8a452bec552edcabdbe;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  coverage: tests AM_MISSING_PROG usage
  docs: document AM_MISSING_PROG

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

27478539b094a2b0bee4f8a452bec552edcabdbe
diff --cc doc/automake.texi
index 73dceabb8,20af53e4e..87776b354
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@@ -4043,10 -4062,19 +4043,20 @@@ variable.  The default @var{compiler-se
  This macro will abort @command{configure} if no Unified Parallel C
  compiler is found.
  
+ @item AM_MISSING_PROG(@var{name}, @var{program})
+ @acindex AM_MISSING_PROG
+ @vindex MISSING
+ Find a maintainer tool @var{program} and define the @var{name}
+ environment variable with its location.  If @var{program} is not
+ detected, then @var{name} will instead invoke the @command{missing}
+ script, in order to give useful advice to the user about the missing
+ maintainer tool.  @xref{maintainer-mode}, for more information on when
+ the @command{missing} script is appropriate.
+ 
  @item AM_SILENT_RULES
  @acindex AM_SILENT_RULES
 -Enable the machinery for less verbose build output (@pxref{Options}).
 +Control the machinery for less verbose build output
 +(@pxref{Automake Silent Rules}).
  
  @item AM_WITH_DMALLOC
  @acindex AM_WITH_DMALLOC
diff --cc t/list-of-tests.mk
index 054a03afd,5967fcb5a..e5c08a205
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@@ -124,9 -123,9 +124,9 @@@ t/alpha2.sh 
  t/amhello-cflags.sh \
  t/amhello-cross-compile.sh \
  t/amhello-binpkg.sh \
 -t/aminit-moreargs-deprecation.sh \
 +t/aminit-moreargs-no-more.sh \
  t/amassign.sh \
- t/ammissing.sh \
+ t/am-macro-not-found.sh \
  t/amopt.sh \
  t/amopts-location.sh \
  t/amopts-variable-expansion.sh \
@@@ -667,9 -680,15 +667,10 @@@ t/mdate3.sh 
  t/mdate4.sh \
  t/mdate5.sh \
  t/mdate6.sh \
 -t/missing.sh \
 -t/missing2.sh \
 +t/missing-version-mismatch.sh \
  t/missing3.sh \
 -t/missing4.sh \
 -t/missing5.sh \
 -t/missing6.sh \
+ t/am-missing-prog.sh \
  t/missing-auxfile-stops-makefiles-creation.sh \
 -t/mkdirp-deprecation.sh \
  t/mkinstall.sh \
  t/mkinst2.sh \
  t/mkinst3.sh \