With integrating GJDoc, we also gained AC_PROG_JAVA. This removes
the existing --with-vm option which duplicates this functionality,
so that all tools use AC_PROG_JAVA.
This now means that instead of using a parameter to --with-vm or
getting jamvm by default, configure will check for cacao, jamvm,
kaffe, gij and java (in that order). This check can be overridden
by defining JAVA.
I also made the tools use '-classpath' instead of '-Xbootclasspath/p'.
The latter is non-standard and not supported by gij or jikesrvm.
ChangeLog:
2008-06-21 Andrew John Hughes <[EMAIL PROTECTED]>
* 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.
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: configure.ac
===================================================================
RCS file: /sources/classpath/classpath/configure.ac,v
retrieving revision 1.234
diff -u -u -r1.234 configure.ac
--- configure.ac 13 Jun 2008 09:16:40 -0000 1.234
+++ configure.ac 21 Jun 2008 21:13:48 -0000
@@ -300,20 +300,6 @@
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 @@
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 @@
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 || \
Index: tools/gappletviewer.in
===================================================================
RCS file: /sources/classpath/classpath/tools/gappletviewer.in,v
retrieving revision 1.4
diff -u -u -r1.4 gappletviewer.in
--- tools/gappletviewer.in 13 May 2007 23:00:56 -0000 1.4
+++ tools/gappletviewer.in 21 Jun 2008 21:13:58 -0000
@@ -44,4 +44,4 @@
[EMAIL PROTECTED]@/@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 "$@"
Index: tools/gjar.in
===================================================================
RCS file: /sources/classpath/classpath/tools/gjar.in,v
retrieving revision 1.3
diff -u -u -r1.3 gjar.in
--- tools/gjar.in 13 May 2007 23:00:56 -0000 1.3
+++ tools/gjar.in 21 Jun 2008 21:13:58 -0000
@@ -45,4 +45,4 @@
[EMAIL PROTECTED]@/@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 "$@"
Index: tools/gjarsigner.in
===================================================================
RCS file: /sources/classpath/classpath/tools/gjarsigner.in,v
retrieving revision 1.4
diff -u -u -r1.4 gjarsigner.in
--- tools/gjarsigner.in 13 May 2007 23:00:56 -0000 1.4
+++ tools/gjarsigner.in 21 Jun 2008 21:13:58 -0000
@@ -45,4 +45,4 @@
[EMAIL PROTECTED]@/@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 "$@"
Index: tools/gjavah.in
===================================================================
RCS file: /sources/classpath/classpath/tools/gjavah.in,v
retrieving revision 1.4
diff -u -u -r1.4 gjavah.in
--- tools/gjavah.in 13 May 2007 23:00:56 -0000 1.4
+++ tools/gjavah.in 21 Jun 2008 21:13:59 -0000
@@ -45,4 +45,4 @@
[EMAIL PROTECTED]@/@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 "$@"
Index: tools/gjdoc.in
===================================================================
RCS file: /sources/classpath/classpath/tools/gjdoc.in,v
retrieving revision 1.1
diff -u -u -r1.1 gjdoc.in
--- tools/gjdoc.in 27 May 2008 19:25:33 -0000 1.1
+++ tools/gjdoc.in 21 Jun 2008 21:13:59 -0000
@@ -46,4 +46,4 @@
tools_cp=${tools_dir}/tools.zip
[EMAIL PROTECTED]@
-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 "$@"
Index: tools/gkeytool.in
===================================================================
RCS file: /sources/classpath/classpath/tools/gkeytool.in,v
retrieving revision 1.4
diff -u -u -r1.4 gkeytool.in
--- tools/gkeytool.in 13 May 2007 23:00:56 -0000 1.4
+++ tools/gkeytool.in 21 Jun 2008 21:13:59 -0000
@@ -45,4 +45,4 @@
[EMAIL PROTECTED]@/@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 "$@"
Index: tools/gnative2ascii.in
===================================================================
RCS file: /sources/classpath/classpath/tools/gnative2ascii.in,v
retrieving revision 1.4
diff -u -u -r1.4 gnative2ascii.in
--- tools/gnative2ascii.in 13 May 2007 23:00:56 -0000 1.4
+++ tools/gnative2ascii.in 21 Jun 2008 21:13:59 -0000
@@ -45,4 +45,4 @@
[EMAIL PROTECTED]@/@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 "$@"
Index: tools/gorbd.in
===================================================================
RCS file: /sources/classpath/classpath/tools/gorbd.in,v
retrieving revision 1.3
diff -u -u -r1.3 gorbd.in
--- tools/gorbd.in 13 May 2007 23:00:56 -0000 1.3
+++ tools/gorbd.in 21 Jun 2008 21:13:59 -0000
@@ -45,4 +45,4 @@
[EMAIL PROTECTED]@/@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 "$@"
Index: tools/grmic.in
===================================================================
RCS file: /sources/classpath/classpath/tools/grmic.in,v
retrieving revision 1.4
diff -u -u -r1.4 grmic.in
--- tools/grmic.in 13 May 2007 23:00:56 -0000 1.4
+++ tools/grmic.in 21 Jun 2008 21:13:59 -0000
@@ -45,4 +45,4 @@
[EMAIL PROTECTED]@/@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 "$@"
Index: tools/grmid.in
===================================================================
RCS file: /sources/classpath/classpath/tools/grmid.in,v
retrieving revision 1.3
diff -u -u -r1.3 grmid.in
--- tools/grmid.in 13 May 2007 23:00:56 -0000 1.3
+++ tools/grmid.in 21 Jun 2008 21:13:59 -0000
@@ -45,4 +45,4 @@
[EMAIL PROTECTED]@/@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 "$@"
Index: tools/grmiregistry.in
===================================================================
RCS file: /sources/classpath/classpath/tools/grmiregistry.in,v
retrieving revision 1.3
diff -u -u -r1.3 grmiregistry.in
--- tools/grmiregistry.in 13 May 2007 23:00:56 -0000 1.3
+++ tools/grmiregistry.in 21 Jun 2008 21:13:59 -0000
@@ -45,4 +45,4 @@
[EMAIL PROTECTED]@/@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 "$@"
Index: tools/gserialver.in
===================================================================
RCS file: /sources/classpath/classpath/tools/gserialver.in,v
retrieving revision 1.4
diff -u -u -r1.4 gserialver.in
--- tools/gserialver.in 13 May 2007 23:00:56 -0000 1.4
+++ tools/gserialver.in 21 Jun 2008 21:13:59 -0000
@@ -45,4 +45,4 @@
[EMAIL PROTECTED]@/@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
"$@"
Index: tools/gtnameserv.in
===================================================================
RCS file: /sources/classpath/classpath/tools/gtnameserv.in,v
retrieving revision 1.3
diff -u -u -r1.3 gtnameserv.in
--- tools/gtnameserv.in 13 May 2007 23:00:56 -0000 1.3
+++ tools/gtnameserv.in 21 Jun 2008 21:13:59 -0000
@@ -45,4 +45,4 @@
[EMAIL PROTECTED]@/@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 "$@"
