2006-02-10 John (J5) Palmieri <johnp@redhat.com>

	* gcj/Makefile.am: point to correct jar command (Bug #4529)
	patch from Doug Goldstein <cardoe at gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index ab8c1a4..ac15adb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2006-02-09  Joe Shaw  <joeshaw@novell.com
+2006-02-10  John (J5) Palmieri  <johnp@redhat.com>
+
+       * gcj/Makefile.am: point to correct jar command (Bug #4529)
+       patch from Doug Goldstein <cardoe at gentoo.org>
+
+2006-02-09  Joe Shaw  <joeshaw@novell.com>
 
        * mono/Arguments.cs: Fix a magic number in the mono bindings
        that doesn't work on 64 bit arches.  Patch from Peter Johanson.

diff --git a/configure.in b/configure.in
index 9d41042..49f370d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -211,6 +211,8 @@ fi
 if test x$enable_gcj = xyes; then
     if test x$have_gcj = xno ; then
        AC_MSG_ERROR([Building gcj explicitly required, but gcj not found])
+    else 
+        AC_CHECK_PROGS(JAR, gcj-jar fastjar jar)
     fi
 fi
 
@@ -1412,7 +1414,8 @@ echo "
 if test x$enable_gcj = xyes ; then
 echo \
 "        gcj:                    ${GCJ}
-       gcjflags:                 ${GCJFLAGS}"
+       gcjflags:                 ${GCJFLAGS}
+       jar:                      ${JAR}"
 else
 echo \
 "        gcj:                      (not enabled)"

diff --git a/gcj/Makefile.am b/gcj/Makefile.am
index 608cdbe..5ee26b9 100644 (file)
--- a/gcj/Makefile.am
+++ b/gcj/Makefile.am
@@ -1,5 +1,4 @@
 SUBDIRS=org
-JAR=jar
 
 CLEANFILES=dbus-1.jar