changeset in /hg/icedtea: 2008-01-07 Dalibor Topic <robilad at ka...

[Lillian Angel]

changeset 5beec17eace2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5beec17eace2
description:
	2008-01-07  Dalibor Topic  <robilad at kaffe.org>

	        Fixes Bug #95
	        * acinclude: Added additional check for libgcj-4.1.jar, if
	        libgcj-4.1.2.jar is not found.

diffstat:

3 files changed, 21 insertions(+), 2 deletions(-)
ChangeLog    |    8 ++++++++
acinclude.m4 |    7 ++++++-
configure    |    8 +++++++-

diffs (57 lines):

diff -r e93a5415014f -r 5beec17eace2 ChangeLog
--- a/ChangeLog	Mon Jan 07 14:22:26 2008 -0500
+++ b/ChangeLog	Mon Jan 07 14:28:08 2008 -0500
@@ -1,9 +1,17 @@ 2008-01-07  Lillian Angel  <langel at redha
+2008-01-07  Dalibor Topic  <robilad at kaffe.org>
+
+	Fixes Bug #95
+	* acinclude.m4: Added additional check for libgcj-4.1.jar, if 
+	libgcj-4.1.2.jar is not found.
+	* configure: Regenerate.
+
 2008-01-07  Lillian Angel  <langel at redhat.com>
 
 	Fixes Bug #93
 	* Makefile.am
 	(clean): New target- alias for distclean.
 	(ports): New target- alias for stamps/ports.stamp.
+	* Makefile.in: Regenerate.
 
 2008-01-07  Lillian Angel  <langel at redhat.com>
 	
diff -r e93a5415014f -r 5beec17eace2 acinclude.m4
--- a/acinclude.m4	Mon Jan 07 14:22:26 2008 -0500
+++ b/acinclude.m4	Mon Jan 07 14:28:08 2008 -0500
@@ -214,7 +214,12 @@ AC_DEFUN([FIND_LIBGCJ_JAR],
       LIBGCJ_JAR=/usr/share/java/libgcj-4.1.2.jar
       AC_MSG_RESULT(${LIBGCJ_JAR})
     else
-      AC_MSG_RESULT(no)
+      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
diff -r e93a5415014f -r 5beec17eace2 configure
--- a/configure	Mon Jan 07 14:22:26 2008 -0500
+++ b/configure	Mon Jan 07 14:28:08 2008 -0500
@@ -6474,8 +6474,14 @@ echo $ECHO_N "checking for libgcj-4.1.2.
       { echo "$as_me:$LINENO: result: ${LIBGCJ_JAR}" >&5
 echo "${ECHO_T}${LIBGCJ_JAR}" >&6; }
     else
-      { echo "$as_me:$LINENO: result: no" >&5
+      if test -e "/usr/share/java/libgcj-4.1.jar"; then
+        LIBGCJ_JAR=/usr/share/java/libgcj-4.1.jar
+	{ echo "$as_me:$LINENO: result: ${LIBGCJ_JAR}" >&5
+echo "${ECHO_T}${LIBGCJ_JAR}" >&6; }
+      else
+        { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
+      fi
     fi
   fi
   if test -z "${LIBGCJ_JAR}"; then