[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-469-g9393a25

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=9393a25995d4bbedc5103cce3e7dd9a7dd39e8d6

The branch, maint has been updated
       via  9393a25995d4bbedc5103cce3e7dd9a7dd39e8d6 (commit)
       via  d5ebf21cccd0597f53e7b3c4063dff4704e454a6 (commit)
      from  0209b6ddef31d414e59c6f34ae7642e9785b5770 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9393a25995d4bbedc5103cce3e7dd9a7dd39e8d6
Merge: 0209b6d d5ebf21
Author: Stefano Lattarini <address@hidden>
Date:   Mon Sep 19 18:24:44 2011 +0200

    Merge branch 'fix-java-prefix-is-unexpected' into maint

commit d5ebf21cccd0597f53e7b3c4063dff4704e454a6
Author: Stefano Lattarini <address@hidden>
Date:   Mon Sep 19 18:21:25 2011 +0200

    tests: fix spurious failure in 'primary-prefix-valid-couples.test'
    
    * tests/primary-prefix-valid-couples.test: After commit
    v1.11-464-gc9dfc36, `java_JAVA' is not a valid prefix/primary
    combination by default anymore: one has to explicitly define
    $(javadir) to make it so.  So just drop `java_JAVA' from our
    Makefile.am  Also, since we are at it, ...
    (configure.in): ... remove AM_PROG_GCJ from here, as it's not
    really required.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                               |   11 +++++++++++
 tests/primary-prefix-valid-couples.test |    2 --
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aec00f4..72b7dad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2011-09-19  Stefano Lattarini  <address@hidden>
 
+       tests: fix spurious failure in 'primary-prefix-valid-couples.test'
+       * tests/primary-prefix-valid-couples.test: After commit
+       v1.11-464-gc9dfc36, `java_JAVA' is not a valid prefix/primary
+       combination by default anymore: one has to explicitly define
+       $(javadir) to make it so.  So just drop `java_JAVA' from our
+       Makefile.am  Also, since we are at it, ...
+       (configure.in): ... remove AM_PROG_GCJ from here, as it's not
+       really required.
+
+2011-09-19  Stefano Lattarini  <address@hidden>
+
        docs: deprecate JAVA primary
        * doc/automake.texi (Java): Deprecate the JAVA primary, stating
        that it will become obsolete in automake 1.12 and probably removed
diff --git a/tests/primary-prefix-valid-couples.test 
b/tests/primary-prefix-valid-couples.test
index f326808..36ff5d8 100755
--- a/tests/primary-prefix-valid-couples.test
+++ b/tests/primary-prefix-valid-couples.test
@@ -25,7 +25,6 @@ cat >> configure.in <<'END'
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_PROG_LIBTOOL
-AM_PROG_GCJ
 AM_PATH_PYTHON
 AM_PATH_LISPDIR
 END
@@ -78,7 +77,6 @@ done
 echo "info_TEXINFOS = foo.texi" >> Makefile.am
 echo "lisp_LISP = foo.el" >> Makefile.am
 echo "python_PYTHON = foo.py" >> Makefile.am
-echo "java_JAVA = foo.java" >> Makefile.am
 
 awk '{print NR ":" $0}' Makefile.am # For debugging.
 


hooks/post-receive
-- 
GNU Automake