changeset in /hg/icedtea6: 2008-08-15 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

changeset bb468b09871b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bb468b09871b
description:
	2008-08-15  Matthias Klose  <doko at ubuntu.com>

	        * acinclude.m4 (FIND_LIBGCJ_JAR): Extend check for libgcj-4.2.*.jar.

diffstat:

2 files changed, 10 insertions(+), 3 deletions(-)
ChangeLog    |    4 ++++
acinclude.m4 |    9 ++++++---

diffs (42 lines):

diff -r 87bc57c2a16e -r bb468b09871b ChangeLog
--- 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  Xerxes Ranby <xerxes at zafena.
+2008-08-15  Matthias Klose  <doko at ubuntu.com>
+
+	* acinclude.m4 (FIND_LIBGCJ_JAR): Extend check for libgcj-4.2.*.jar.
+
 2008-08-15  Xerxes Ranby <xerxes at zafena.se>
 
 	* acinclude.m4: Fixed LIBGCJ_JAR check.
diff -r 87bc57c2a16e -r bb468b09871b acinclude.m4
--- 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 @@ AC_DEFUN([FIND_LIBGCJ_JAR],
 [
   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 @@ AC_DEFUN([FIND_LIBGCJ_JAR],
     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