[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. v1.10.2-64-g6ed816f

[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=6ed816f5457bec4e1a74569f29514bdce1b65661

The branch, branch-1-10 has been updated
       via  6ed816f5457bec4e1a74569f29514bdce1b65661 (commit)
       via  02fc0c246c745def58260a6d0d9703155e6667ea (commit)
       via  88f25e43bda7ff8eb669a519116c5e3b7fc487d9 (commit)
      from  2e705c49f9742e52354de14bffbc4260a1ff375a (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 6ed816f5457bec4e1a74569f29514bdce1b65661
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jun 7 08:34:04 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>

commit 02fc0c246c745def58260a6d0d9703155e6667ea
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jun 7 08:32:08 2009 +0200

    testsuite: unset installation directory variables.
    
    * tests/defs.in: Before test execution, be sure to unset all
    installation directory variables, so they cannot have an effect
    on a `make -e install' command within a test.
    Report by Dagobert Michelsen.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 88f25e43bda7ff8eb669a519116c5e3b7fc487d9
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jun 7 08:22:27 2009 +0200

    testsuite: do not change the mode of installed Libtool files.
    
    * tests/defs.in: Do not use `chmod -R' on the test directory, as
    that may change or try to change the mode of installed files:
    the test directory may contain symlinks to ltmain.sh files from
    a Libtool installation, and Solaris `chmod -R' touches symlink
    targets.  Instead, use the cleanup strategy used in distdir.am.
    * NEWS: Update.
    Report by Dagobert Michelsen.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog     |   25 +++++++++++++++++++++++++
 NEWS          |    6 ++++++
 m4/gcj.m4     |    4 ++--
 tests/defs.in |   16 ++++++++++++++--
 4 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index df7f536..a17da52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+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-23  Ralf Wildenhues  <address@hidden>
+
+       testsuite: unset installation directory variables.
+       * tests/defs.in: Before test execution, be sure to unset all
+       installation directory variables, so they cannot have an effect
+       on a `make -e install' command within a test.
+       Report by Dagobert Michelsen.
+
+       testsuite: do not change the mode of installed Libtool files.
+       * tests/defs.in: Do not use `chmod -R' on the test directory, as
+       that may change or try to change the mode of installed files:
+       the test directory may contain symlinks to ltmain.sh files from
+       a Libtool installation, and Solaris `chmod -R' touches symlink
+       targets.  Instead, use the cleanup strategy used in distdir.am.
+       * NEWS: Update.
+       Report by Dagobert Michelsen.
+
 2009-05-11  Ralf Wildenhues  <address@hidden>
 
        For PR automake/540:
diff --git a/NEWS b/NEWS
index 48206b9..4a8726d 100644
--- a/NEWS
+++ b/NEWS
@@ -37,6 +37,12 @@ Bugs fixed in 1.10.2a:
     newlines, and end in a comment sign.  Previous versions would silently
     and wrongly ignore such assignments completely.
 
+  - 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.
+
 * Bugs introduced by 1.10.2:
 
   - The manual wrongly contained portions of the 1.11a manual.
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"
diff --git a/tests/defs.in b/tests/defs.in
index 68e84f5..477706c 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -250,8 +250,10 @@ Exit ()
   exit $1
 }
 
-chmod -R a+rwx testSubDir > /dev/null 2>&1
-rm -rf testSubDir > /dev/null 2>&1
+test ! -d testSubDir || {
+  find testSubDir -type d ! -perm -200 -exec chmod u+w {} ";"
+  rm -rf testSubDir
+}
 mkdir testSubDir
 
 # Copy in some files we need.
@@ -279,7 +281,17 @@ END
 unset MFLAGS
 unset MAKEFLAGS
 unset MAKELEVEL
+# Also unset variables that will let `make -e install' divert
+# files into unwanted directories.
 unset DESTDIR
+unset prefix exec_prefix bindir datarootdir datadir docdir dvidir
+unset htmldir includedir infodir libdir libexecdir localedir mandir
+unset oldincludedir pdfdir psdir sbindir sharedstatedir sysconfdir
+# Also unset variables that control our test driver.  While not
+# conceptually independent, they cause some changed semantics we
+# need to control (and test for) in some of the tests to ensure
+# backward-compatible behavior.
+unset TESTS
 
 echo "=== Running test $0"
 


hooks/post-receive
-- 
GNU Automake