From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 16 Jun 2011 15:23:31 +0000 (+0200)
Subject: Merge branch 'maint' into python-work
X-Git-Tag: v1.11.1b~18^2^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc27b8fa70ffad842a525e05d5069022b96f6388;p=thirdparty%2Fautomake.git

Merge branch 'maint' into python-work

* maint:
  news: update w.r.t. introduction of AM_DISTCHECK_CONFIGURE_FLAGS
  tests: optimize tests on primary/prefix mismatch for speed
  Warnings about primary/prefix mismatch fixed and extended.
  maintcheck: DISTCHECK_CONFIGURE_FLAGS can be defined on make cmdline
  distcheck: add support for AM_DISTCHECK_CONFIGURE_FLAGS
  docs: better documentation for silent make rules
---

fc27b8fa70ffad842a525e05d5069022b96f6388
diff --cc NEWS
index db6504877,fd7dd53d1..300809d41
--- a/NEWS
+++ b/NEWS
@@@ -5,11 -5,14 +5,19 @@@ New in 1.11.0a
    - The `lzma' compression scheme and associated automake option `dist-lzma'
      is obsoleted by `xz' and `dist-xz' due to upstream changes.
  
 +  - The py-compile script now accepts empty arguments passed to the options
 +    `--destdir' and `--basedir', and complains about unrecognized options.
 +    Moreover, a non-option argument or a special `--' arguments terminates
 +    the list of options.
 +
+   - A developer that needs to pass specific flags to configure at "make
+     distcheck" time can now, and indeed he's advised to, do so by defining
+     the developer-reserved makefile variable AM_DISTCHECK_CONFIGURE_FLAGS,
+     instead of the old DISTCHECK_CONFIGURE_FLAGS.
+     The DISTCHECK_CONFIGURE_FLAGS variable should now be reserved for the
+     user; still, the old Makefile.am files that used to define it should
+     still continue to work as before.
+ 
  Bugs fixed in 1.11.0a:
  
  * Bugs introduced by 1.11:
diff --cc tests/Makefile.am
index b2d36ff69,bd3f99c25..cde88eea1
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -632,14 -636,11 +636,18 @@@ prefix.test 
  primary.test \
  primary2.test \
  primary3.test \
+ primary-prefix-invalid-couples.test \
+ primary-prefix-valid-couples.test \
+ primary-prefix-couples-force-valid.test \
+ primary-prefix-couples-documented-valid.test \
  proginst.test \
 +py-compile-basic.test \
 +py-compile-basic2.test \
 +py-compile-basedir.test \
 +py-compile-destdir.test \
 +py-compile-env.test \
 +py-compile-option-terminate.test \
 +py-compile-usage.test \
  python.test \
  python2.test \
  python3.test \
diff --cc tests/Makefile.in
index 7eb545a45,b81096374..ffd38c277
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -903,14 -907,11 +907,18 @@@ prefix.test 
  primary.test \
  primary2.test \
  primary3.test \
+ primary-prefix-invalid-couples.test \
+ primary-prefix-valid-couples.test \
+ primary-prefix-couples-force-valid.test \
+ primary-prefix-couples-documented-valid.test \
  proginst.test \
 +py-compile-basic.test \
 +py-compile-basic2.test \
 +py-compile-basedir.test \
 +py-compile-destdir.test \
 +py-compile-env.test \
 +py-compile-option-terminate.test \
 +py-compile-usage.test \
  python.test \
  python2.test \
  python3.test \