Mercurial > hg > release > icedtea7-2.0
changeset 2484:04bf32baa40f
Update list of JDKs to check. Only check for IcedTea6 VMs when not bootstrapping until PR716 is fixed.
2011-09-27 Andrew John Hughes <ahughes@redhat.com>
* acinclude.m4:
(AC_CHECK_FOR_JDK): Look for IcedTea7 JDKs.
Don't check for IcedTea6 JDKs when bootstrapping
until PR716 is fixed.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 28 Sep 2011 21:55:51 +0100 |
| parents | 8d011581534d |
| children | e4c9d9bd4a99 |
| files | ChangeLog acinclude.m4 |
| diffstat | 2 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Sep 28 21:44:40 2011 +0100 +++ b/ChangeLog Wed Sep 28 21:55:51 2011 +0100 @@ -1,3 +1,10 @@ +2011-09-27 Andrew John Hughes <ahughes@redhat.com> + + * acinclude.m4: + (AC_CHECK_FOR_JDK): Look for IcedTea7 JDKs. + Don't check for IcedTea6 JDKs when bootstrapping + until PR716 is fixed. + 2011-09-27 Andrew John Hughes <ahughes@redhat.com> PR790: Include JAXP, JAF and JAXWS sources directly
--- a/acinclude.m4 Wed Sep 28 21:44:40 2011 +0100 +++ b/acinclude.m4 Wed Sep 28 21:55:51 2011 +0100 @@ -1138,10 +1138,12 @@ if test -z "${SYSTEM_JDK_DIR}"; then if test "x${enable_bootstrap}" = "xyes"; then BOOTSTRAP_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk /usr/lib/jvm/cacao"; + else + ICEDTEA6_VMS="/usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk" fi - for dir in ${BOOTSTRAP_VMS} /usr/lib/jvm/java-openjdk \ - /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \ - /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea ; do + ICEDTEA7_VMS="/usr/lib/jvm/icedtea7 /usr/lib/jvm/java-1.7.0-openjdk" + for dir in ${BOOTSTRAP_VMS} ${ICEDTEA7_VMS} ${ICEDTEA6_VMS} \ + /usr/lib/jvm/java-openjdk /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea ; do if test -d $dir; then SYSTEM_JDK_DIR=$dir break