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.

15 files changed, 43 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index 58708bbaf..08500a6c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,26 @@
 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.
+	
+2008-06-21  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
 	* m4/ac_prog_java.m4:
 	Add CACAO and JamVM.
 	* m4/ac_prog_javac.m4:
diff --git a/configure.ac b/configure.ac
index ceb03a913..1df123bda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -300,20 +300,6 @@ AC_ARG_WITH([glibj-dir],
 AC_SUBST(glibjdir)
 
 dnl -----------------------------------------------------------
-dnl Sets the VM name for use in tool wrapper scripts
-dnl -----------------------------------------------------------
-AC_ARG_WITH([vm],
-	    [AS_HELP_STRING(--with-vm,sets the VM binary name [default='${prefix}/bin/jamvm'])],
-	    [
-	     VM_BINARY=${withval}
-	    ],
-	    [
-	     VM_BINARY='${prefix}/bin/jamvm'
-	    ])
-
-AC_SUBST(VM_BINARY)
-
-dnl -----------------------------------------------------------
 dnl Sets the Antlr jar to use for compiling gjdoc
 dnl -----------------------------------------------------------
 AC_ARG_WITH([antlr-jar],
@@ -376,10 +362,6 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CPP
 
-if test "x${COMPILE_GJDOC}" = xyes; then
-  AC_PROG_ANTLR(2,7,1)
-fi
-
 # Handle -Werror default case.
 if test "$ENABLE_WERROR" = default; then
   case "$host_os" in
@@ -948,6 +930,15 @@ esac;
 AM_CONDITIONAL(USE_PREBUILT_GLIBJ_ZIP, test x$use_glibj_zip = xtrue)
 AC_SUBST(PATH_TO_GLIBJ_ZIP)
 
+if test "x${TOOLSDIR}" != x; then
+  if test "x${COMPILE_WRAPPERS}" = xno; then
+    AC_PROG_JAVA
+  fi
+  if test "x${COMPILE_GJDOC}" = xyes; then
+    AC_PROG_ANTLR(2,7,1)
+  fi
+fi
+
 # Check for javac if we need to build either the class library,
 # the examples or the tools
 if test "x${use_glibj_zip}" = xfalse || \
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 "$@"