[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-746-gfbb398a

[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=fbb398a168fc2387814c419fc44bd24114f10d7e

The branch, master has been updated
       via  fbb398a168fc2387814c419fc44bd24114f10d7e (commit)
       via  744705d420e809cc3da27a253892aa69defec4ce (commit)
      from  475fe6935b26ff42cfe7b88bd87cf0563a7c866e (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 fbb398a168fc2387814c419fc44bd24114f10d7e
Merge: 475fe69 744705d
Author: Stefano Lattarini <address@hidden>
Date:   Sun Apr 10 09:50:49 2011 +0200

    Merge branch 'maint'
    
    test defs: new requirement for the default java compiler
    
    * tests/defs (for tool in $required): New requirement 'javac'.
    * tests/java.test: Use it instead of ad-hoc configure check.
    * tests/java-check.test: Likewise.
    * tests/java-extra.test: Likewise.
    * tests/java-noinst.test: Likewise.
    * tests/instfail-java.test: Likewise.
    * tests/instdir-java.test: Likewise.

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

Summary of changes:
 ChangeLog                |   11 +++++++++++
 tests/defs               |    4 ++++
 tests/instdir-java.test  |    3 +--
 tests/instfail-java.test |    3 +--
 tests/java-check.test    |    3 +--
 tests/java-extra.test    |    3 +--
 tests/java-noinst.test   |    6 +++---
 tests/java.test          |    3 +--
 8 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 96969a8..45688e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-04-10  Stefano Lattarini  <address@hidden>
+
+       test defs: new requirement for the default java compiler
+       * tests/defs.in (for tool in $required): New requirement 'javac'.
+       * tests/java.test: Use it instead of ad-hoc configure check.
+       * tests/java-check.test: Likewise.
+       * tests/java-extra.test: Likewise.
+       * tests/java-noinst.test: Likewise.
+       * tests/instfail-java.test: Likewise.
+       * tests/instdir-java.test: Likewise.
+
 2011-04-09  Stefano Lattarini  <address@hidden>
 
        java: check_JAVA does not cause compilation by "make all" anymore
diff --git a/tests/defs b/tests/defs
index e994a40..77bb534 100644
--- a/tests/defs
+++ b/tests/defs
@@ -286,6 +286,10 @@ do
       echo "$me: running $CC -V -help"
       $CC -V -help || exit 77
       ;;
+    javac)
+      echo "$me: running javac -version"
+      javac -version || exit 77
+      ;;
     makedepend)
       echo "$me: running makedepend -f-"
       makedepend -f- || exit 77
diff --git a/tests/instdir-java.test b/tests/instdir-java.test
index 5831f27..8cad153 100755
--- a/tests/instdir-java.test
+++ b/tests/instdir-java.test
@@ -16,11 +16,10 @@
 
 # If $(javadir) is the empty string, then nothing should be installed there.
 
+required=javac
 . ./defs || Exit 1
 
 cat >>configure.in <<'END'
-AC_CHECK_PROG([HAS_JAVAC], [javac], [:], [exit])
-($HAS_JAVAC 77); $HAS_JAVAC 77
 AC_OUTPUT
 END
 
diff --git a/tests/instfail-java.test b/tests/instfail-java.test
index 4ebc2c3..a570297 100755
--- a/tests/instfail-java.test
+++ b/tests/instfail-java.test
@@ -19,11 +19,10 @@
 
 # This is the java sister test of instfail.test.
 
+required=javac
 . ./defs || Exit 1
 
 cat >>configure.in <<'END'
-AC_CHECK_PROG([HAS_JAVAC], [javac], [:], [exit])
-($HAS_JAVAC 77); $HAS_JAVAC 77
 AC_OUTPUT
 END
 
diff --git a/tests/java-check.test b/tests/java-check.test
index fd3fc96..a67b4e8 100755
--- a/tests/java-check.test
+++ b/tests/java-check.test
@@ -18,13 +18,12 @@
 # "make check", and not also with "make all".
 # See automake bug#8234.
 
+required=javac
 . ./defs || Exit 1
 
 set -e
 
 cat >> configure.in << 'END'
-AC_CHECK_PROG([HAS_JAVAC], [javac], [:], [exit])
-($HAS_JAVAC 77); $HAS_JAVAC 77
 AC_OUTPUT
 END
 
diff --git a/tests/java-extra.test b/tests/java-extra.test
index 5309964..9837d75 100755
--- a/tests/java-extra.test
+++ b/tests/java-extra.test
@@ -19,13 +19,12 @@
 # EXTRA_JAVA exists mostly for ensuring interoperation with Automake
 # conditionals).
 
+required=javac
 . ./defs || Exit 1
 
 set -e
 
 cat >> configure.in << 'END'
-AC_CHECK_PROG([HAS_JAVAC], [javac], [:], [exit])
-($HAS_JAVAC 77); $HAS_JAVAC 77
 AM_CONDITIONAL([COND], [test x"$cond" = x"yes"])
 AC_OUTPUT
 END
diff --git a/tests/java-noinst.test b/tests/java-noinst.test
index 130ea63..6babc27 100755
--- a/tests/java-noinst.test
+++ b/tests/java-noinst.test
@@ -14,15 +14,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure that noinst_JAVA causes generated *.class files not to be 
installed.
+# Make sure that noinst_JAVA causes generated *.class files not to be
+# installed.
 
+required=javac
 . ./defs || Exit 1
 
 set -e
 
 cat >> configure.in << 'END'
-AC_CHECK_PROG([HAS_JAVAC], [javac], [:], [exit])
-($HAS_JAVAC 77); $HAS_JAVAC 77
 AC_OUTPUT
 END
 
diff --git a/tests/java.test b/tests/java.test
index f4259d4..671d2fd 100755
--- a/tests/java.test
+++ b/tests/java.test
@@ -17,11 +17,10 @@
 
 # Minimal test of Java functionality.
 
+required=javac
 . ./defs || Exit 1
 
 cat >>configure.in <<'EOF'
-AC_CHECK_PROG([HAS_JAVAC], [javac], [:], [exit])
-($HAS_JAVAC 77); $HAS_JAVAC 77
 AC_OUTPUT
 EOF
 


hooks/post-receive
-- 
GNU Automake