changeset in /hg/icedtea6: 2008-08-13 Lillian Angel <langel at re...
Lillian Angel
langel at redhat.com
Thu Aug 14 08:09:59 PDT 2008
changeset cd5c0ea5fe82 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cd5c0ea5fe82
description:
2008-08-13 Lillian Angel <langel at redhat.com>
* acinclude.m4: Changed LIBGCJ_JAR check to be less stringent with
minor versions.
diffstat:
2 files changed, 15 insertions(+), 20 deletions(-)
ChangeLog | 5 +++++
acinclude.m4 | 30 ++++++++++--------------------
diffs (54 lines):
diff -r a469b20018d9 -r cd5c0ea5fe82 ChangeLog
--- a/ChangeLog Wed Aug 13 15:46:18 2008 +0100
+++ b/ChangeLog Thu Aug 14 11:06:24 2008 -0400
@@ -1,3 +1,8 @@ 2008-08-13 Gary Benson <gbenson at redhat
+2008-08-13 Lillian Angel <langel at redhat.com>
+
+ * acinclude.m4: Changed LIBGCJ_JAR check to be less stringent with
+ minor versions.
+
2008-08-13 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp
diff -r a469b20018d9 -r cd5c0ea5fe82 acinclude.m4
--- a/acinclude.m4 Wed Aug 13 15:46:18 2008 +0100
+++ b/acinclude.m4 Thu Aug 14 11:06:24 2008 -0400
@@ -254,28 +254,18 @@ AC_DEFUN([FIND_LIBGCJ_JAR],
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
More information about the distro-pkg-dev
mailing list