Merge branch 'dejagnu-siteexp-extend' into maint

* dejagnu-siteexp-extend:
  dejagnu: allow the package developer to extend site.exp

diff --cc ChangeLog
index 0d38b70,18bc070..0836c77
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,18 +1,29 @@@
  2011-10-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
+       dejagnu: allow the package developer to extend site.exp
+       Fixes automake bug#7873.
+       * lib/am/dejagnu.am (site.exp): Depend from the files listed in
+       $(EXTRA_DEJAGNU_SITE_CONFIG), if any.  Append their contents to
+       the generated site.exp (still preserving user edits).
+       * doc/automake.texi (Dejagnu Tests): Update.
+       * tests/dejagnu-siteexp-append.test: New test.
+       * tests/dejagnu-siteexp-extend.test: Likewise.
+       * tests/dejagnu-siteexp-useredit.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+       Suggestion by Rainer Orth.
+ 
++2011-10-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
++
 +      dejagnu: ensure 'srcdir' is defined as a relative directory
 +      This change fixes automake bug#7833.
 +      * lib/am/dejagnu.am (check-DEJAGNU): Prefer using plain $(srcdir)
 +      over calculating and using the absolute path of $(srcdir).
 +      * tests/dejagnu-relative-srcdir.test: New test.
 +      * tests/dejagnu-absolute-builddir.test: Likewise.
 +      * tests/Makefile.am (TESTS): Update.
 +      Report by Ian Lance Taylor.  Suggestions by Ralf Wildenhues.
 +
  2010-12-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
        Fix testsuite failure of check12.test without DejaGNU.

diff --cc NEWS
index 7e30ed0,e42d53c..92c7735
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -27,19 -5,10 +27,23 @@@ 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 `--' argument 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.
 +
+   - When using DejaGnu-based testsuites, the user can extend the `site.exp'
+     file generated by automake-provided rules by defining the special make
+     variable `$(EXTRA_DEJAGNU_SITE_CONFIG)'.
+ 
  Bugs fixed in 1.11.0a:
  
  * Bugs introduced by 1.11:

diff --cc doc/automake.texi
Simple merge

diff --cc lib/am/dejagnu.am
Simple merge

diff --cc tests/Makefile.am
index 9cd85a5,d947cb4..efb4fea
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -295,8 -255,9 +295,11 @@@ dejagnu4.test 
  dejagnu5.test \
  dejagnu6.test \
  dejagnu7.test \
 +dejagnu-absolute-builddir.test \
 +dejagnu-relative-srcdir.test \
+ dejagnu-siteexp-extend.test \
+ dejagnu-siteexp-append.test \
+ dejagnu-siteexp-useredit.test \
  depacl2.test \
  depcomp.test \
  depcomp2.test \

diff --cc tests/Makefile.in
index 10ab42c,323d4db..f12b81d
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -579,8 -523,9 +579,11 @@@ dejagnu4.test 
  dejagnu5.test \
  dejagnu6.test \
  dejagnu7.test \
 +dejagnu-absolute-builddir.test \
 +dejagnu-relative-srcdir.test \
+ dejagnu-siteexp-extend.test \
+ dejagnu-siteexp-append.test \
+ dejagnu-siteexp-useredit.test \
  depacl2.test \
  depcomp.test \
  depcomp2.test \