diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2010-05-04 17:31:18 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2010-05-04 17:31:18 +0000 |
| commit | a1878e0b67b5f23bbcbe1e1850785239148e8d90 (patch) | |
| tree | b877af0ac26c29054504974fc2b0575220a65496 | |
| parent | 4d2215111c0a8c84fc2d472c95c12d4747e5e144 (diff) | |
| download | classpath-a1878e0b67b5f23bbcbe1e1850785239148e8d90.tar.gz | |
Cleanup output of javac is gcj test.
2010-05-04 Andrew John Hughes <ahughes@redhat.com>
* m4/ac_prog_javac.m4:
Capture all output from javac --version
to avoid excess output. Make sure no appears
when javac is not gcj.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | m4/ac_prog_javac.m4 | 7 |
2 files changed, 12 insertions, 2 deletions
@@ -1,5 +1,12 @@ 2010-05-04 Andrew John Hughes <ahughes@redhat.com> + * m4/ac_prog_javac.m4: + Capture all output from javac --version + to avoid excess output. Make sure no appears + when javac is not gcj. + +2010-05-04 Andrew John Hughes <ahughes@redhat.com> + * configure.ac: Add output to GMP directory detection and only perform when compiling GMP. diff --git a/m4/ac_prog_javac.m4 b/m4/ac_prog_javac.m4 index baf518600..84a72206a 100644 --- a/m4/ac_prog_javac.m4 +++ b/m4/ac_prog_javac.m4 @@ -46,10 +46,13 @@ else fi test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH]) AC_CACHE_CHECK([if $JAVAC is a version of gcj], ac_cv_prog_javac_is_gcj, [ -if $JAVAC --version | grep gcj > /dev/null; then +if $JAVAC --version 2>&1 | grep gcj >&AS_MESSAGE_LOG_FD ; then ac_cv_prog_javac_is_gcj=yes; JAVAC="$JAVAC $GCJ_OPTS"; -fi]) +else + ac_cv_prog_javac_is_gcj=no; +fi +]) AC_SUBST(JAVAC_IS_GCJ, $ac_cv_prog_javac_is_gcj) AM_CONDITIONAL(GCJ_JAVAC, test x"${JAVAC_IS_GCJ}" = xyes) AC_PROG_JAVAC_WORKS |