Mercurial > hg > release > icedtea6-1.10
changeset 2592:287ce812e84e
PR1194: IcedTea tries to build with /usr/lib/jvm/java-openjdk (now a 1.7 VM) by default
2012-03-19 Andrew John Hughes <ahughes@redhat.com>
PR 1194:
* acinclude.m4:
(IT_CHECK_FOR_JDK): Update JDK home directory
check list, adding some missing 1.6 entries
and removing generic ones which may now pick
up an unwanted 1.7 installation.
* NEWS: Updated.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Fri, 12 Oct 2012 02:26:29 +0100 |
| parents | d64dd8e0811e |
| children | 1fc1f8fb1d66 |
| files | ChangeLog NEWS acinclude.m4 |
| diffstat | 3 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Sep 05 11:43:29 2012 +0200 +++ b/ChangeLog Fri Oct 12 02:26:29 2012 +0100 @@ -1,3 +1,13 @@ +2012-03-19 Andrew John Hughes <ahughes@redhat.com> + + PR 1194: + * acinclude.m4: + (IT_CHECK_FOR_JDK): Update JDK home directory + check list, adding some missing 1.6 entries + and removing generic ones which may now pick + up an unwanted 1.7 installation. + * NEWS: Updated. + 2012-09-05 Matthias Klose <doko@ubuntu.com> * configure.ac: Remove the Xp header and library checks.
--- a/NEWS Wed Sep 05 11:43:29 2012 +0200 +++ b/NEWS Fri Oct 12 02:26:29 2012 +0100 @@ -11,6 +11,9 @@ New in release 1.10.10 (2012-XX-XX): +* Bug fixes + - PR1194: IcedTea tries to build with /usr/lib/jvm/java-openjdk (now a 1.7 VM) by default + New in release 1.10.9 (2012-08-31): * Security fixes
--- a/acinclude.m4 Wed Sep 05 11:43:29 2012 +0200 +++ b/acinclude.m4 Fri Oct 12 02:26:29 2012 +0100 @@ -1140,9 +1140,9 @@ if test "x${enable_bootstrap}" = "xyes"; then BOOTSTRAP_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk /usr/lib/jvm/cacao"; fi - for dir in ${BOOTSTRAP_VMS} /usr/lib/jvm/java-openjdk \ + for dir in ${BOOTSTRAP_VMS} /usr/lib/jvm/java-1.6.0 \ /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \ - /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea ; do + /usr/lib/jvm/java-1.6.0-openjdk /usr/lib/jvm/icedtea-6 ; do if test -d $dir; then SYSTEM_JDK_DIR=$dir break