diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-02-01 10:19:18 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-02-01 10:19:18 +0000 |
| commit | a97c0e1e336366cd53fcd95e00e49fd72b154fa6 (patch) | |
| tree | e82424aba4ceeda9dfa0e50d5a314603ca415e3d /libjava | |
| parent | 6bf1e21f89e43e23336eaa4ee4f40987cd01d495 (diff) | |
| download | gcc-a97c0e1e336366cd53fcd95e00e49fd72b154fa6.tar.gz | |
2011-02-01 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 169468
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@169469 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 5 | ||||
| -rwxr-xr-x | libjava/classpath/configure | 2 | ||||
| -rw-r--r-- | libjava/classpath/configure.ac | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index a6b453d5781..84c35ed7d77 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,8 @@ +2011-01-31 Alexandre Oliva <aoliva@redhat.com> + + * configure.ac (GCJ_JAVAC): Run false rather than no. + * configure: Rebuilt. + 2011-01-03 Jakub Jelinek <jakub@redhat.com> * gnu/java/rmi/registry/RegistryImpl.java (version): Update diff --git a/libjava/classpath/configure b/libjava/classpath/configure index 8ed8064f6a9..fc05b834492 100755 --- a/libjava/classpath/configure +++ b/libjava/classpath/configure @@ -24182,7 +24182,7 @@ $as_echo "no" >&6; } else - if no; then + if false; then GCJ_JAVAC_TRUE= GCJ_JAVAC_FALSE='#' else diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index ab72c161c52..0a267851a19 100644 --- a/libjava/classpath/configure.ac +++ b/libjava/classpath/configure.ac @@ -1076,7 +1076,7 @@ if test "x${use_glibj_zip}" = xfalse || \ AC_PROG_JAVAC_WORKS CLASSPATH_JAVAC_MEM_CHECK else - AM_CONDITIONAL(GCJ_JAVAC, no) + AM_CONDITIONAL(GCJ_JAVAC, false) fi dnl ----------------------------------------------------------- |