projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New module 'fchownat', split off from module 'openat'.
[gnulib.git]
/
build-aux
/
javaexec.sh.in
diff --git
a/build-aux/javaexec.sh.in
b/build-aux/javaexec.sh.in
index
db896e4
..
e273e42
100644
(file)
--- a/
build-aux/javaexec.sh.in
+++ b/
build-aux/javaexec.sh.in
@@
-1,13
+1,13
@@
#!/bin/sh
# Execute a Java program.
#!/bin/sh
# Execute a Java program.
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001
, 2006, 2009-2011
Free Software Foundation, Inc.
# Written by Bruno Haible <haible@clisp.cons.org>, 2001.
#
# Written by Bruno Haible <haible@clisp.cons.org>, 2001.
#
-# This program is free software
;
you can redistribute it and/or modify
+# This program is free software
:
you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version
2, or (at your option)
-# any later version.
+# the Free Software Foundation; either version
3 of the License, or
+#
(at your option)
any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,8
+15,7
@@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# GNU General Public License for more details.
#
# 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. */
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# This uses the same choices as javaexec.c, but instead of relying on the
# environment settings at run time, it uses the environment variables
# This uses the same choices as javaexec.c, but instead of relying on the
# environment settings at run time, it uses the environment variables
@@
-27,9
+26,9
@@
#
# The extra CLASSPATH must have been set prior to calling this script.
#
# The extra CLASSPATH must have been set prior to calling this script.
-CONF_JAVA='@JAVA@'
+CONF_JAVA='@
CONF_
JAVA@'
CONF_CLASSPATH='@CLASSPATH@'
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}"
# Combine given CLASSPATH and configured CLASSPATH.
if test -n "$CLASSPATH"; then
CLASSPATH="$CLASSPATH${CONF_CLASSPATH:+@CLASSPATH_SEPARATOR@$CONF_CLASSPATH}"
@@
-43,20
+42,24
@@
else
unset JAVA_HOME
export CLASSPATH
if test -n "@HAVE_GIJ@"; then
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
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
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
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
else
echo 'Java virtual machine not found, try installing gij or set $JAVA, then reconfigure' 1>&2
exit 1