changeset in /hg/icedtea: 2008-10-16 Matthias Klose <doko at ubun...

[doko at ubuntu.com]

changeset ae8c53f37fb0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ae8c53f37fb0
description:
	2008-10-16  Matthias Klose  <doko at ubuntu.com>

	        * acinclude.m4 (FIND_LIBGCJ_JAR): Fix check, when configuring
	        without --with-libgcj-jar.

diffstat:

2 files changed, 17 insertions(+), 11 deletions(-)
ChangeLog    |    5 +++++
acinclude.m4 |   23 ++++++++++++-----------

diffs (48 lines):

diff -r c926c9674b4c -r ae8c53f37fb0 ChangeLog
--- a/ChangeLog	Thu Oct 16 02:38:41 2008 +0100
+++ b/ChangeLog	Thu Oct 16 13:06:48 2008 +0200
@@ -1,3 +1,8 @@ 2008-10-16  Andrew John Hughes  <gnu_and
+2008-10-16  Matthias Klose  <doko at ubuntu.com>
+
+	* acinclude.m4 (FIND_LIBGCJ_JAR): Fix check, when configuring
+	without --with-libgcj-jar.
+
 2008-10-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r c926c9674b4c -r ae8c53f37fb0 acinclude.m4
--- a/acinclude.m4	Thu Oct 16 02:38:41 2008 +0100
+++ b/acinclude.m4	Thu Oct 16 13:06:48 2008 +0200
@@ -255,20 +255,21 @@ AC_DEFUN([FIND_LIBGCJ_JAR],
   ])
   if test -z "${LIBGCJ_JAR}"; then
     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
+    for jar in /usr/share/java/libgcj-4.3*.jar; do
+      test -e $jar && LIBGCJ_JAR=$jar
+    done
+    if test -n ${LIBGCJ_JAR}; then
       AC_MSG_RESULT(${LIBGCJ_JAR})
     else
-       AM_CONDITIONAL(GCC_OLD, test x = x)
-       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
+      AM_CONDITIONAL(GCC_OLD, test x = x)
+      for jar in /usr/share/java/libgcj-4.1*.jar /usr/share/java/libgcj-4.2*.jar; do
+	test -e $jar && LIBGCJ_JAR=$jar
+      done
+      if test -n ${LIBGCJ_JAR}; then
+	AC_MSG_RESULT(${LIBGCJ_JAR})
+      else
  	AC_MSG_RESULT(no)
-       fi
+      fi
     fi
   fi
   if test -z "${LIBGCJ_JAR}"; then