summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2008-02-15 21:13:01 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2008-02-15 21:13:01 +0000
commit129437cde065631c40d9492186ef9abe73fa186c (patch)
treec455748fd8db37298a95ec654c6cc88f4c9af234 /m4
parentc16bf0bb4b41362a6f0a35fb1d61744f1487bfcb (diff)
downloadclasspath-129437cde065631c40d9492186ef9abe73fa186c.tar.gz
2008-02-15 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/34579: * m4/ac_prog_javac_works.m4: Change test to one that doesn't rely on the compiler's class library.
Diffstat (limited to 'm4')
-rw-r--r--m4/ac_prog_javac_works.m412
1 files changed, 8 insertions, 4 deletions
diff --git a/m4/ac_prog_javac_works.m4 b/m4/ac_prog_javac_works.m4
index 757718e3f..02b1f28c3 100644
--- a/m4/ac_prog_javac_works.m4
+++ b/m4/ac_prog_javac_works.m4
@@ -18,13 +18,17 @@ dnl Modified to test for 1.5 by Andrew John Hughes on 2008-02-11
AC_DEFUN([AC_PROG_JAVAC_WORKS],[
AC_CACHE_CHECK([if $JAVAC works], ac_cv_prog_javac_works, [
-JAVA_TEST=Colour.java
-CLASS_TEST=Colour.class
+JAVA_TEST=Object.java
+CLASS_TEST=Object.class
cat << \EOF > $JAVA_TEST
/* [#]line __oline__ "configure" */
-public enum Colour
+package java.lang;
+
+public class Object
{
-RED, ORANGE, YELLOW, GREEN, BLUE, INDIGO, VIOLET;
+ static <T> void doStuff()
+ {
+ }
}
EOF
if AC_TRY_COMMAND($JAVAC $JAVACFLAGS -source 1.5 -target 1.5 $JAVA_TEST) >/dev/null 2>&1; then