From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 6 Feb 2012 22:17:32 +0000 (+0100)
Subject: Merge branch 'maint' into yacc-work
X-Git-Tag: v1.11b~118^2~3^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df6841b7d543abc9731b4b42a2392089a41fb838;p=thirdparty%2Fautomake.git

Merge branch 'maint' into yacc-work

* maint: (75 commits)
  test defs: function 'is_newest' now works also with directories
  refactor: new variable telling whether make is running in "dry mode"
  ...
---

df6841b7d543abc9731b4b42a2392089a41fb838
diff --cc NEWS
index a627c21b2,eb9af221f..8fae2dd6a
--- a/NEWS
+++ b/NEWS
@@@ -69,24 -96,24 +96,38 @@@ New in 1.11.0a
      the `${infodir}/dir' file, by exporting the new environment variable
      `AM_UPDATE_INFO_DIR' to the value "no".
  
+   - For programs and libraries, automake now detects EXTRA_foo_DEPENDENCIES
+     and adds them to the normal list of dependencies, but without
+     overwriting the foo_DEPENDENCIES variable, which is normally computed
+     by automake.
+ 
 +* Changes to Yacc support:
 +
 +  - C source and header files derived from non-distributed Yacc and/or
 +    Lex sources are now removed by a simple "make clean" (while they were
 +    previously removed only "make maintainer-clean").
 +
 +  - Slightly backward-incompatible change, relevant only for use of Yacc
 +    with C++: the extensions of the header files produced by the Yacc
 +    rules are now modelled after extension of the sources corresponding
 +    sources.  For example, yacc files named "foo.y++" and "bar.yy" will
 +    produce header files named respectively "foo.h++" and "bar.hh", where
 +    they would have previously produced header files named simply "foo.h"
 +    and "bar.h".  This change offers better compatibility with `bison -o'.
 +
  Bugs fixed in 1.11.0a:
  
+ * Bugs introduced by 1.11.2:
+ 
+   - Automake now correctly recognizes the prefix/primary combination
+    `pkglibexec_SCRIPTS' as valid.
+ 
  * Bugs introduced by 1.11:
  
+   - The parallel-tests harness doesn't trip anymore on sed implementations
+     with stricter limits on the length of input lines (problem seen at
+     least on Solaris 8).
+ 
    - The `parallel-tests' test driver works around a GNU make 3.80 bug with
      trailing white space in the test list (`TESTS = foo $(EMPTY)'), and
      does not report spurious successes when used with concurrent FreeBSD
diff --cc tests/defs.in
index 59e3e117d,4990e307f..620f65870
--- a/tests/defs.in
+++ b/tests/defs.in
@@@ -95,10 -95,8 +95,11 @@@ PATH_SEPARATOR='@PATH_SEPARATOR@
  SHELL='@SHELL@'
  export SHELL
  # User can override various tools used.
+ MAKE=${AM_TESTSUITE_MAKE-${MAKE-'make'}}
  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@"