[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11-19-gc07ba99

[Ralf Wildenhues]

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=c07ba99c3ff710f11f5dab5b038b401e40595a9f

The branch, branch-1.11 has been updated
       via  c07ba99c3ff710f11f5dab5b038b401e40595a9f (commit)
       via  cc17cffcc0ca60f1ee26f05c1ed1f9e4d701630d (commit)
      from  1e9987417d55fa277d8f3b379321fc76f18c49af (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 c07ba99c3ff710f11f5dab5b038b401e40595a9f
Merge: 1e9987417d55fa277d8f3b379321fc76f18c49af 
cc17cffcc0ca60f1ee26f05c1ed1f9e4d701630d
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jun 7 08:05:25 2009 +0200

    Merge branch 'maint' into branch-1.11

commit cc17cffcc0ca60f1ee26f05c1ed1f9e4d701630d
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jun 7 08:03:08 2009 +0200

    AM_PROG_GCJ: use AC_CHECK_TOOLS for gcj, for cross compilation.
    
    * m4/gcj.m4 (AM_PROG_GCJ): Use AC_CHECK_TOOLS, rather than
    AC_CHECK_PROGS, when searching for `gcj'.
    * NEWS: Update.
    Report by Jack Kelly.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog |    8 ++++++++
 NEWS      |    3 +++
 m4/gcj.m4 |    4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7ed6854..be253f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-07  Ralf Wildenhues  <address@hidden>
+
+       AM_PROG_GCJ: use AC_CHECK_TOOLS for gcj, for cross compilation.
+       * m4/gcj.m4 (AM_PROG_GCJ): Use AC_CHECK_TOOLS, rather than
+       AC_CHECK_PROGS, when searching for `gcj'.
+       * NEWS: Update.
+       Report by Jack Kelly.
+
 2009-05-24  Jack Kelly  <address@hidden>  (tiny change)
            Ralf Wildenhues  <address@hidden>
 
diff --git a/NEWS b/NEWS
index c3bb3ab..cd427fb 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,9 @@ Bugs fixed in 1.11.0a:
   - The testsuite does not try to change the mode of `ltmain.sh' files from
     a Libtool installation (symlinked to test directories) any more.
 
+  - AM_PROG_GCJ uses AC_CHECK_TOOLS to look for `gcj' now, so that prefixed
+    tools are preferred in a cross-compile setup.
+
 
 New in 1.11:
 
diff --git a/m4/gcj.m4 b/m4/gcj.m4
index 5d1e00f..9e930e0 100644
--- a/m4/gcj.m4
+++ b/m4/gcj.m4
@@ -1,14 +1,14 @@
 # Check for Java compiler.                                  -*- Autoconf -*-
 # For now we only handle the GNU compiler.
 
-# Copyright (C) 1999, 2000, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2005, 2009  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([AM_PROG_GCJ],[
-AC_CHECK_PROGS(GCJ, gcj, gcj)
+AC_CHECK_TOOLS(GCJ, gcj, gcj)
 test -z "$GCJ" && AC_MSG_ERROR([no acceptable gcj found in \$PATH])
 if test "x${GCJFLAGS-unset}" = xunset; then
    GCJFLAGS="-g -O2"


hooks/post-receive
-- 
GNU Automake