Mercurial > hg > release > icedtea6-1.2
changeset 552:5beec17eace2 cacao
2008-01-07 Dalibor Topic <robilad@kaffe.org>
Fixes Bug #95
* acinclude: Added additional check for libgcj-4.1.jar, if
libgcj-4.1.2.jar is not found.
| author | Lillian Angel <langel@redhat.com> |
|---|---|
| date | Mon, 07 Jan 2008 14:28:08 -0500 |
| parents | e93a5415014f |
| children | 4ae750ec9b01 |
| files | ChangeLog acinclude.m4 configure |
| diffstat | 3 files changed, 21 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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 Dalibor Topic <robilad@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@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@redhat.com>
--- 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 @@ 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
--- 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 "$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