From d846cac5ac9a07e565e696ff5938800f70a04b00 Mon Sep 17 00:00:00 2001
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Sat, 21 Jun 2008 21:20:17 +0000
Subject: 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.
---
 configure.ac | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index ceb03a913..1df123bda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -299,20 +299,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 -----------------------------------------------------------
@@ -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 || \
-- 
cgit v1.2.1