diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2007-10-12 21:37:42 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2007-10-12 21:37:42 +0000 |
| commit | 55d11b5361854fd1f3aea514b25f76d85abe3153 (patch) | |
| tree | 8683ba3ecad72361dde3889bcb02d90a79213b50 /m4 | |
| parent | 087c1673781a83274e25506da7f0502df9a89b09 (diff) | |
| download | classpath-55d11b5361854fd1f3aea514b25f76d85abe3153.tar.gz | |
2007-10-12 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/33622:
* lib/Makefile.am: Use JAVAC_ARGS variable.
* m4/acinclude.m4: Check javac is 1.5 compliant
and whether it supports -J.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/acinclude.m4 | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index a9b6fd811..88a7faa32 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -444,6 +444,7 @@ AC_DEFUN([CLASSPATH_WITH_JAVAC], CLASSPATH_CHECK_JAVAC ]) AC_SUBST(JAVAC) + AC_SUBST(JAVAC_OPTS) ]) dnl ----------------------------------------------------------- @@ -454,4 +455,28 @@ AC_DEFUN([CLASSPATH_CHECK_JAVAC], else AC_PATH_PROG(JAVAC, "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; +}} +EOF + $JAVAC conftest.java + javac_result=$? + if test "x$javac_result" = "x0"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_WARN([1.5 capable javac required]) + fi + AC_MSG_CHECKING([whether javac supports -J]) + $JAVAC -J-Xmx512M conftest.java + javac_result=$? + if test "x$javac_result" = "x0"; then + AC_MSG_RESULT([yes]) + JAVAC_OPTS="-J-Xmx512M" + else + AC_MSG_RESULT([javac doesn't support -J]) + fi ]) |