Mercurial > hg > release > icedtea6-1.4
changeset 1016:626751ee178e
2008-08-14 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:14:26 -0400 |
| parents | 288bdc0696ff (current diff) cd5c0ea5fe82 (diff) |
| children | 1ff78f827345 |
| files | ChangeLog |
| diffstat | 2 files changed, 15 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Aug 14 16:54:46 2008 +0200 +++ b/ChangeLog Thu Aug 14 11:14:26 2008 -0400 @@ -1,3 +1,8 @@ +2008-08-14 Lillian Angel <langel@redhat.com> + + * acinclude.m4: Changed LIBGCJ_JAR check to be less stringent with + minor versions. + 2008-08-14 Mark Wielaard <mark@klomp.org> * patches/icedtea-signed-types-hot6.patch: New patch.
--- a/acinclude.m4 Thu Aug 14 16:54:46 2008 +0200 +++ b/acinclude.m4 Thu Aug 14 11:14:26 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