From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 11 Jun 2011 10:49:31 +0000 (+0200)
Subject: Merge branch 'maint' into yacc-work
X-Git-Tag: ylwrap-refactor-abandoned-branch~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9474426b7637f2d6dcfa454f0e77bb0ebe1fd741;p=thirdparty%2Fautomake.git

Merge branch 'maint' into yacc-work

* maint:
  test defs: new function 'fatal_', for hard errors
  maintcheck: fix some failures, extend some checks
  automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE
  build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too
  remake: behave better with non-GNU make in subdirectories
  tests/README: fix example about `make -e' usage
---

9474426b7637f2d6dcfa454f0e77bb0ebe1fd741
diff --cc NEWS
index f8618680d,b7f9b541c..3f8a357f7
--- a/NEWS
+++ b/NEWS
@@@ -76,14 -62,9 +76,19 @@@ Bugs fixed in 1.11.0a
    - Java sources specified with check_JAVA are not compiled anymore upon
      "make all", but only upon "make check".
  
 +  - Automake now detects the presence of the `-d' flag in the various
 +    `*YFLAGS' variables even when their definitions involve indirections
 +    through other variables, such as in:
 +      foo_opts = -d
 +      AM_YFLAGS = $(foo_opts)
 +
 +  - Automake now complains if a `*YFLAGS' variable has any conditional
 +    content, not only a conditional definition.
++
+   - Now aclocal and automake, when they've to spawn autoconf or autom4te
+     processes, honour the configure-time definitions of AUTOCONF and
+     AUTOM4TE.
++
  
  New in 1.11:
  
diff --cc tests/defs.in
index 736c42772,5849fbdbe..5cf3d9a42
--- a/tests/defs.in
+++ b/tests/defs.in
@@@ -96,12 -96,12 +96,14 @@@ SHELL='@SHELL@
  export SHELL
  # User can override various tools used.
  test -z "$PERL" && PERL='@PERL@'
 +test -z "$YACC" && YACC='@YACC@'
 +test -z "$LEX" && LEX='@LEX@'
  test -z "$MAKE" && MAKE=make
  test -z "$AUTOCONF" && AUTOCONF="@am_AUTOCONF@"
+ test -z "$AUTOM4TE" && AUTOM4TE="@am_AUTOM4TE@"
+ test -z "$AUTORECONF" && AUTORECONF="@am_AUTORECONF@"
  test -z "$AUTOHEADER" && AUTOHEADER="@am_AUTOHEADER@"
- test -z "$AUTOUPDATE" && AUTOUPDATE=autoupdate
+ test -z "$AUTOUPDATE" && AUTOUPDATE="@am_AUTOUPDATE@"
  test -z "$MISSING" && MISSING=`pwd`/../lib/missing
  # Use -Werror because this also turns some Perl warnings into error.
  # (Tests for which this is inappropriate should use -Wno-error.)