[g-a-devel]java-access-bidge Patch (really included this time)

[Marc Mulcahy <Marc Mulcahy Sun COM>]

Here's the patch.

Index: configure.in
===================================================================
RCS file: /cvs/gnome/java-access-bridge/configure.in,v
retrieving revision 1.19
diff -u -r1.19 configure.in
--- configure.in	18 Jul 2003 14:49:01 -0000	1.19
+++ configure.in	25 Aug 2003 06:54:29 -0000
@@ -88,6 +88,17 @@
 fi
 AC_SUBST(IDLJ)
 
+if test "x$JAVA_HOME" != "x" ; then
+  AC_CHECK_FILE("$JAVA_HOME/bin/jar", JAR="$JAVA_HOME/bin/jar",
+	AC_MSG_ERROR([$JAVA_ERROR_MESSAGE]))
+else
+  AC_CHECK_PROG(JAR, jar, jar, no)
+  if test "x$JAR" = xno; then
+    AC_MSG_ERROR([$JAVA_ERROR_MESSAGE])
+  fi
+fi
+AC_SUBST(JAR)
+
 PKG_CHECK_MODULES(JAVA_BRIDGE, bonobo-activation-2.0 libspi-1.0 >= 1.3.4)
 
 IDLJ_IDLDIRS=
Index: at-client/Makefile.am
===================================================================
RCS file: /cvs/gnome/java-access-bridge/at-client/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- at-client/Makefile.am	9 May 2003 07:50:31 -0000	1.4
+++ at-client/Makefile.am	25 Aug 2003 06:54:29 -0000
@@ -3,7 +3,6 @@
 CLASSES=$(wildcard org/GNOME/*/*.class)
 JAVA_FILES=$(wildcard org/GNOME/*/*.java)
 DEP_CLASSES=$(JAVA_FILES:.java=.class)
-JAR=jar
 
 jar-stamp: ../jar-stamp
 	echo
Index: bridge/Makefile.am
===================================================================
RCS file: /cvs/gnome/java-access-bridge/bridge/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- bridge/Makefile.am	9 May 2003 07:50:33 -0000	1.10
+++ bridge/Makefile.am	25 Aug 2003 06:54:29 -0000
@@ -3,7 +3,6 @@
 CLASSES=$(wildcard org/GNOME/*/*.class)
 JAVA_FILES=$(wildcard org/GNOME/*/*.java)
 DEP_CLASSES=$(JAVA_FILES:.java=.class)
-JAR=jar
 
 EXTRA_DIST = $(properties_DATA)
 
Index: impl/Makefile.am
===================================================================
RCS file: /cvs/gnome/java-access-bridge/impl/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- impl/Makefile.am	9 May 2003 07:50:36 -0000	1.6
+++ impl/Makefile.am	25 Aug 2003 06:54:29 -0000
@@ -3,7 +3,6 @@
 CLASSES=$(wildcard org/GNOME/*/*.class)
 JAVA_FILES=$(wildcard org/GNOME/*/*.java)
 DEP_CLASSES=$(JAVA_FILES:.java=.class)
-JAR=jar
 
 jar-stamp: ../jar-stamp
 	echo
Index: test/Makefile.am
===================================================================
RCS file: /cvs/gnome/java-access-bridge/test/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- test/Makefile.am	9 May 2003 07:50:38 -0000	1.4
+++ test/Makefile.am	25 Aug 2003 06:54:29 -0000
@@ -15,7 +15,7 @@
 	CLASSPATH=$(top_srcdir)/idlgen:$(top_srcdir)/impl:$(top_srcdir)/bridge:$(top_srcdir)/util:$(top_srcdir)/at-client $(JAVAC) $<
 
 $(JNAV_JAR): $(CLASSES)
-	jar -cmf $(JNAV_MANIFEST) $@ JNav*.class
+	$(JAR) -cmf $(JNAV_MANIFEST) $@ JNav*.class
 
 clean-local:
 	$(RM) *.class $(JNAV_JAR)
Index: util/Makefile.am
===================================================================
RCS file: /cvs/gnome/java-access-bridge/util/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- util/Makefile.am	9 May 2003 07:50:40 -0000	1.4
+++ util/Makefile.am	25 Aug 2003 06:54:29 -0000
@@ -3,7 +3,6 @@
 CLASSES=$(wildcard org/GNOME/*/*.class)
 JAVA_FILES=$(wildcard org/GNOME/*/*.java)
 DEP_CLASSES=$(JAVA_FILES:.java=.class)
-JAR=jar
 
 jar-stamp: ../jar-stamp
 	echo