Mercurial > hg > release > icedtea6-1.4
changeset 1015:cd5c0ea5fe82
2008-08-13 Lillian Angel <langel@redhat.com>
* acinclude.m4: Changed LIBGCJ_JAR check to be less stringent with
minor versions.
| author | Lillian Angel <langel@redhat.com> |
|---|---|
| date | Thu, 14 Aug 2008 11:06:24 -0400 |
| parents | a469b20018d9 |
| children | 626751ee178e |
| files | ChangeLog acinclude.m4 |
| diffstat | 2 files changed, 15 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Aug 13 15:46:18 2008 +0100 +++ b/ChangeLog Thu Aug 14 11:06:24 2008 -0400 @@ -1,3 +1,8 @@ +2008-08-13 Lillian Angel <langel@redhat.com> + + * acinclude.m4: Changed LIBGCJ_JAR check to be less stringent with + minor versions. + 2008-08-13 Gary Benson <gbenson@redhat.com> * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp
--- a/acinclude.m4 Wed Aug 13 15:46:18 2008 +0100 +++ b/acinclude.m4 Thu Aug 14 11:06:24 2008 -0400 @@ -254,28 +254,18 @@ LIBGCJ_JAR= ]) if test -z "${LIBGCJ_JAR}"; then - AC_MSG_CHECKING(for libgcj-4.3.0.jar or libgcj-4.1.2.jar) - if test -e "/usr/share/java/libgcj-4.3.0.jar"; then - LIBGCJ_JAR=/usr/share/java/libgcj-4.3.0.jar + AC_MSG_CHECKING(for libgcj-4.3*.jar or libgcj-4.1*.jar) + if test -e /usr/share/java/libgcj-4.3*.jar; then + LIBGCJ_JAR=/usr/share/java/libgcj-4.3*.jar AC_MSG_RESULT(${LIBGCJ_JAR}) else - if test -e "/usr/share/java/libgcj-4.3.jar"; then - LIBGCJ_JAR=/usr/share/java/libgcj-4.3.jar - AC_MSG_RESULT(${LIBGCJ_JAR}) - else - AM_CONDITIONAL(GCC_OLD, test x = x) - if test -e "/usr/share/java/libgcj-4.1.2.jar"; then - LIBGCJ_JAR=/usr/share/java/libgcj-4.1.2.jar - AC_MSG_RESULT(${LIBGCJ_JAR}) - else - if test -e "/usr/share/java/libgcj-4.1.jar"; then - LIBGCJ_JAR=/usr/share/java/libgcj-4.1.jar - AC_MSG_RESULT(${LIBGCJ_JAR}) - else - AC_MSG_RESULT(no) - fi - fi - fi + AM_CONDITIONAL(GCC_OLD, test x = x) + if test -e /usr/share/java/libgcj-4.1*.jar; then + LIBGCJ_JAR=/usr/share/java/libgcj-4.1*.jar + AC_MSG_RESULT(${LIBGCJ_JAR}) + else + AC_MSG_RESULT(no) + fi fi fi if test -z "${LIBGCJ_JAR}"; then