Mercurial > hg > release > icedtea6-1.3
changeset 1023:bb468b09871b
2008-08-15 Matthias Klose <doko@ubuntu.com>
* acinclude.m4 (FIND_LIBGCJ_JAR): Extend check for libgcj-4.2.*.jar.
| author | doko@ubuntu.com |
|---|---|
| date | Fri, 15 Aug 2008 15:51:05 +0200 |
| parents | 87bc57c2a16e |
| children | 8bd5f7718ae0 |
| files | ChangeLog acinclude.m4 |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Aug 15 09:34:04 2008 -0400 +++ b/ChangeLog Fri Aug 15 15:51:05 2008 +0200 @@ -1,3 +1,7 @@ +2008-08-15 Matthias Klose <doko@ubuntu.com> + + * acinclude.m4 (FIND_LIBGCJ_JAR): Extend check for libgcj-4.2.*.jar. + 2008-08-15 Xerxes Ranby <xerxes@zafena.se> * acinclude.m4: Fixed LIBGCJ_JAR check.
--- a/acinclude.m4 Fri Aug 15 09:34:04 2008 -0400 +++ b/acinclude.m4 Fri Aug 15 15:51:05 2008 +0200 @@ -242,7 +242,7 @@ [ AM_CONDITIONAL(GCC_OLD, test x != x) AC_ARG_WITH([libgcj-jar], - [AS_HELP_STRING(--with-libgcj-jar,specify location of the libgcj 4.3.0 jar)], + [AS_HELP_STRING(--with-libgcj-jar,specify location of the libgcj 4.3.x jar)], [ if test -f "${withval}"; then AC_MSG_CHECKING(libgcj jar) @@ -254,13 +254,16 @@ LIBGCJ_JAR= ]) if test -z "${LIBGCJ_JAR}"; then - AC_MSG_CHECKING(for libgcj-4.3.*.jar or libgcj-4.1.*.jar) + AC_MSG_CHECKING(for libgcj-4.3.*.jar, libgcj-4.2.*.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 AM_CONDITIONAL(GCC_OLD, test x = x) - if test -e /usr/share/java/libgcj-4.1.*.jar; then + if test -e /usr/share/java/libgcj-4.2.*.jar; then + LIBGCJ_JAR=/usr/share/java/libgcj-4.2.*.jar + AC_MSG_RESULT(${LIBGCJ_JAR}) + elif 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