2008-06-21 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* configure.ac:
	Remove --with-vm option, instead relying
	on AC_PROG_JAVA.  Only call this if tools
	are enabled.
	* tools/gappletviewer.in,
	* tools/gjar.in,
	* tools/gjarsigner.in,
	* tools/gjavah.in,
	* tools/gjdoc.in,
	* tools/gkeytool.in,
	* tools/gnative2ascii.in,
	* tools/gorbd.in,
	* tools/grmic.in,
	* tools/grmid.in,
	* tools/grmiregistry.in,
	* tools/gserialver.in,
	* tools/gtnameserv.in:
	Regenerated with @JAVA@ and -classpath option.

13 files changed, 13 insertions, 13 deletions

diff --git a/tools/gappletviewer.in b/tools/gappletviewer.in
index 721078bb7..d957e4564 100644
--- a/tools/gappletviewer.in
+++ b/tools/gappletviewer.in
@@ -44,4 +44,4 @@ datarootdir=@datarootdir@
 tools_dir=@datadir@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.appletviewer.Main "$@"
+exec @JAVA@ -classpath "${tools_cp}" gnu.classpath.tools.appletviewer.Main "$@"
diff --git a/tools/gjar.in b/tools/gjar.in
index da7581167..e3dcea21b 100644
--- a/tools/gjar.in
+++ b/tools/gjar.in
@@ -45,4 +45,4 @@ datarootdir=@datarootdir@
 tools_dir=@datadir@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.jar.Main "$@"
+exec @JAVA@ -classpath "${tools_cp}" gnu.classpath.tools.jar.Main "$@"
diff --git a/tools/gjarsigner.in b/tools/gjarsigner.in
index e3abc6ce6..d51541815 100644
--- a/tools/gjarsigner.in
+++ b/tools/gjarsigner.in
@@ -45,4 +45,4 @@ datarootdir=@datarootdir@
 tools_dir=@datadir@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.jarsigner.Main "$@"
+exec @JAVA@ -classpath "${tools_cp}" gnu.classpath.tools.jarsigner.Main "$@"
diff --git a/tools/gjavah.in b/tools/gjavah.in
index 797721b95..d6f3ab1e3 100644
--- a/tools/gjavah.in
+++ b/tools/gjavah.in
@@ -45,4 +45,4 @@ datarootdir=@datarootdir@
 tools_dir=@datadir@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.javah.Main "$@"
+exec @JAVA@ -classpath "${tools_cp}" gnu.classpath.tools.javah.Main "$@"
diff --git a/tools/gjdoc.in b/tools/gjdoc.in
index f49d01be3..1fb6ca657 100644
--- a/tools/gjdoc.in
+++ b/tools/gjdoc.in
@@ -46,4 +46,4 @@ tools_dir=@datadir@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 antlr_jar=@ANTLR_JAR@
 
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}:${antlr_jar}" gnu.classpath.tools.gjdoc.Main "$@"
+exec @JAVA@ -classpath "${tools_cp}:${antlr_jar}" gnu.classpath.tools.gjdoc.Main "$@"
diff --git a/tools/gkeytool.in b/tools/gkeytool.in
index 59516efe8..3c886f89c 100644
--- a/tools/gkeytool.in
+++ b/tools/gkeytool.in
@@ -45,4 +45,4 @@ datarootdir=@datarootdir@
 tools_dir=@datadir@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.keytool.Main "$@"
+exec @JAVA@ -classpath "${tools_cp}" gnu.classpath.tools.keytool.Main "$@"
diff --git a/tools/gnative2ascii.in b/tools/gnative2ascii.in
index 17d7cd7e0..52d8f6926 100644
--- a/tools/gnative2ascii.in
+++ b/tools/gnative2ascii.in
@@ -45,4 +45,4 @@ datarootdir=@datarootdir@
 tools_dir=@datadir@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.native2ascii.Native2ASCII "$@"
+exec @JAVA@ -classpath "${tools_cp}" gnu.classpath.tools.native2ascii.Native2ASCII "$@"
diff --git a/tools/gorbd.in b/tools/gorbd.in
index 40d01eee2..dbe33d3a0 100644
--- a/tools/gorbd.in
+++ b/tools/gorbd.in
@@ -45,4 +45,4 @@ datarootdir=@datarootdir@
 tools_dir=@datadir@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.orbd.Main "$@"
+exec @JAVA@ -classpath "${tools_cp}" gnu.classpath.tools.orbd.Main "$@"
diff --git a/tools/grmic.in b/tools/grmic.in
index 9b7314429..299b4b50b 100644
--- a/tools/grmic.in
+++ b/tools/grmic.in
@@ -45,4 +45,4 @@ datarootdir=@datarootdir@
 tools_dir=@datadir@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.rmic.Main "$@"
+exec @JAVA@ -classpath "${tools_cp}" gnu.classpath.tools.rmic.Main "$@"
diff --git a/tools/grmid.in b/tools/grmid.in
index 7eefb769d..73e5789ee 100644
--- a/tools/grmid.in
+++ b/tools/grmid.in
@@ -45,4 +45,4 @@ datarootdir=@datarootdir@
 tools_dir=@datadir@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.rmid.Main "$@"
+exec @JAVA@ -classpath "${tools_cp}" gnu.classpath.tools.rmid.Main "$@"
diff --git a/tools/grmiregistry.in b/tools/grmiregistry.in
index d08120af9..e3bbb7386 100644
--- a/tools/grmiregistry.in
+++ b/tools/grmiregistry.in
@@ -45,4 +45,4 @@ datarootdir=@datarootdir@
 tools_dir=@datadir@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.rmiregistry.Main "$@"
+exec @JAVA@ -classpath "${tools_cp}" gnu.classpath.tools.rmiregistry.Main "$@"
diff --git a/tools/gserialver.in b/tools/gserialver.in
index 85aeea62d..24acdeb81 100644
--- a/tools/gserialver.in
+++ b/tools/gserialver.in
@@ -45,4 +45,4 @@ datarootdir=@datarootdir@
 tools_dir=@datadir@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.serialver.SerialVer "$@"
+exec @JAVA@ -classpath "${tools_cp}" gnu.classpath.tools.serialver.SerialVer "$@"
diff --git a/tools/gtnameserv.in b/tools/gtnameserv.in
index 4fbcf3713..119062d09 100644
--- a/tools/gtnameserv.in
+++ b/tools/gtnameserv.in
@@ -45,4 +45,4 @@ datarootdir=@datarootdir@
 tools_dir=@datadir@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.tnameserv.Main "$@"
+exec @JAVA@ -classpath "${tools_cp}" gnu.classpath.tools.tnameserv.Main "$@"