#!/bin/sh
# Execute a Java program.
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
# Written by Bruno Haible <haible@clisp.cons.org>, 2001.
#
# This program is free software; you can redistribute it and/or modify
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# This uses the same choices as javaexec.c, but instead of relying on the
# environment settings at run time, it uses the environment variables
#
# The extra CLASSPATH must have been set prior to calling this script.
-CONF_JAVA='@JAVA@'
+CONF_JAVA='@CONF_JAVA@'
CONF_CLASSPATH='@CLASSPATH@'
-if test -n "$CONF_JAVA"; then
+if test -n "@HAVE_JAVA_ENVVAR@"; then
# Combine given CLASSPATH and configured CLASSPATH.
if test -n "$CLASSPATH"; then
CLASSPATH="$CLASSPATH${CONF_CLASSPATH:+@CLASSPATH_SEPARATOR@$CONF_CLASSPATH}"
unset JAVA_HOME
export CLASSPATH
if test -n "@HAVE_GIJ@"; then
- test -z "$JAVA_VERBOSE" || echo gij "$@"
- exec gij "$@"
+ # In this case, $CONF_JAVA is "gij".
+ test -z "$JAVA_VERBOSE" || echo "$CONF_JAVA $@"
+ exec $CONF_JAVA "$@"
else
if test -n "@HAVE_JAVA@"; then
- test -z "$JAVA_VERBOSE" || echo java "$@"
- exec java "$@"
+ # In this case, $CONF_JAVA is "java".
+ test -z "$JAVA_VERBOSE" || echo "$CONF_JAVA $@"
+ exec $CONF_JAVA "$@"
else
if test -n "@HAVE_JRE@"; then
- test -z "$JAVA_VERBOSE" || echo jre "$@"
- exec jre "$@"
+ # In this case, $CONF_JAVA is "jre".
+ test -z "$JAVA_VERBOSE" || echo "$CONF_JAVA $@"
+ exec $CONF_JAVA "$@"
else
if test -n "@HAVE_JVIEW@"; then
- test -z "$JAVA_VERBOSE" || echo jview "$@"
- exec jview "$@"
+ # In this case, $CONF_JAVA is "jview".
+ test -z "$JAVA_VERBOSE" || echo "$CONF_JAVA $@"
+ exec $CONF_JAVA "$@"
else
echo 'Java virtual machine not found, try installing gij or set $JAVA, then reconfigure' 1>&2
exit 1