diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-01-03 00:28:29 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-01-03 00:28:29 +0000 |
| commit | 5ff425b9f153279ef722f48833db18a5da31c41c (patch) | |
| tree | 0c43f20b32557d07155178fa5044f594a9b19848 /m4 | |
| parent | e5423b521376038afb755aed1526da548d015c84 (diff) | |
| download | classpath-5ff425b9f153279ef722f48833db18a5da31c41c.tar.gz | |
2008-01-03 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/34578:
* m4/acinclude.m4:
(CLASSPATH_CHECK_JAVAC): Don't rely on 1.5 class
library.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/acinclude.m4 | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index e3e609789..4badac3df 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -457,13 +457,12 @@ AC_DEFUN([CLASSPATH_CHECK_JAVAC], fi dnl Test the given javac AC_MSG_CHECKING([if javac is 1.5-capable]) - cat > conftest.java << EOF -public class conftest { -public static void main(String[] args) { -java.util.List<String> l; -}} + cat > Colour.java << EOF +public enum Colour { +RED, ORANGE, YELLOW, GREEN, BLUE, INDIGO, VIOLET; +} EOF - $JAVAC -sourcepath '' conftest.java + $JAVAC -sourcepath '' -bootclasspath '' Colour.java javac_result=$? if test "x$javac_result" = "x0"; then AC_MSG_RESULT([yes]) @@ -471,7 +470,7 @@ EOF AC_MSG_WARN([1.5 capable javac required]) fi AC_MSG_CHECKING([whether javac supports -J]) - $JAVAC -J-Xmx512M -sourcepath '' conftest.java + $JAVAC -J-Xmx512M -sourcepath '' -bootclasspath '' Colour.java javac_result=$? if test "x$javac_result" = "x0"; then AC_MSG_RESULT([yes]) |