Mercurial > hg > release > icedtea-1.9
changeset 1615:b0be146027ad
Fix JDk directory macros to drop out of the default for loop
when the first solution is found. At present, the loop will
use the last solution found. This should be more intuitive.
2009-02-04 Andrew John Hughes <ahughes@redhat.com>
* acinclude.m4:
(AC_CHECK_FOR_GCJ_JDK): Drop out of loop
when first solution is found.
(AC_CHECK_FOR_OPENJDK): Likewise.
(AC_CHECK_FOR_ICEDTEA): Likewise.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 04 Feb 2009 12:48:30 +0000 |
| parents | ab71ebb1e8b6 |
| children | 9923df826001 |
| files | ChangeLog acinclude.m4 |
| diffstat | 2 files changed, 20 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Feb 04 11:51:13 2009 +0000 +++ b/ChangeLog Wed Feb 04 12:48:30 2009 +0000 @@ -1,3 +1,11 @@ +2009-02-04 Andrew John Hughes <ahughes@redhat.com> + + * acinclude.m4: + (AC_CHECK_FOR_GCJ_JDK): Drop out of loop + when first solution is found. + (AC_CHECK_FOR_OPENJDK): Likewise. + (AC_CHECK_FOR_ICEDTEA): Likewise. + 2009-02-04 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/acinclude.m4 Wed Feb 04 11:51:13 2009 +0000 +++ b/acinclude.m4 Wed Feb 04 12:48:30 2009 +0000 @@ -944,7 +944,10 @@ ]) if test -z "${SYSTEM_GCJ_DIR}"; then for dir in /usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk /usr/lib/jvm/cacao ; do - test -d $dir && SYSTEM_GCJ_DIR=$dir + if test -d $dir; then + SYSTEM_GCJ_DIR=$dir + break + fi done fi AC_MSG_RESULT(${SYSTEM_GCJ_DIR}) @@ -977,7 +980,10 @@ ]) if test -z "${SYSTEM_OPENJDK_DIR}"; then for dir in /usr/lib/jvm/java-openjdk /usr/lib/jvm/openjdk ; do - test -d $dir && SYSTEM_OPENJDK_DIR=$dir + if test -d $dir; then + SYSTEM_OPENJDK_DIR=$dir + break + fi done fi AC_MSG_RESULT(${SYSTEM_OPENJDK_DIR}) @@ -1010,7 +1016,10 @@ ]) if test -z "${SYSTEM_ICEDTEA_DIR}"; then for dir in /usr/lib/jvm/java-icedtea /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk ; do - test -d $dir && SYSTEM_ICEDTEA_DIR=$dir + if test -d $dir; then + SYSTEM_ICEDTEA_DIR=$dir + break + fi done fi AC_MSG_RESULT(${SYSTEM_ICEDTEA_DIR})