Mercurial > hg > release > icedtea-1.10
changeset 1844:a1476b6655c1
Search java-icedtea last, as it's the worst choice (old 1.7 on Fedora).
2009-05-27 Andrew John Hughes <ahughes@redhat.com>
* acinclude.m4:
Search java-icedtea last not first. It's
from the old 1.7 packages on Fedora (and can
be empty), so should be our last choice.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Thu, 28 May 2009 19:31:50 +0100 |
| parents | c1ca56ce26f5 |
| children | 331c91ed45cd |
| files | ChangeLog acinclude.m4 |
| diffstat | 2 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu May 28 15:06:49 2009 +0100 +++ b/ChangeLog Thu May 28 19:31:50 2009 +0100 @@ -1,3 +1,10 @@ +2009-05-27 Andrew John Hughes <ahughes@redhat.com> + + * acinclude.m4: + Search java-icedtea last not first. It's + from the old 1.7 packages on Fedora (and can + be empty), so should be our last choice. + 2009-05-27 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/acinclude.m4 Thu May 28 15:06:49 2009 +0100 +++ b/acinclude.m4 Thu May 28 19:31:50 2009 +0100 @@ -1213,9 +1213,9 @@ SYSTEM_OPENJDK_DIR= ]) if test -z "${SYSTEM_OPENJDK_DIR}"; then - for dir in /usr/lib/jvm/java-icedtea /usr/lib/jvm/java-openjdk \ - /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \ - /usr/lib/jvm/openjdk; do + for dir in /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 if test -d $dir; then SYSTEM_OPENJDK_DIR=$dir break @@ -1251,9 +1251,9 @@ SYSTEM_ICEDTEA_DIR= ]) if test -z "${SYSTEM_ICEDTEA_DIR}"; then - for dir in /usr/lib/jvm/java-icedtea /usr/lib/jvm/java-openjdk \ - /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \ - /usr/lib/jvm/openjdk; do + for dir in /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 if test -d $dir; then SYSTEM_ICEDTEA_DIR=$dir break