diff options
| author | Bruno Haible <bruno@clisp.org> | 2003-11-13 15:36:30 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:11:14 +0200 |
| commit | 79ec0b0f21fa417c8bfa277066f771dbc2adf623 (patch) | |
| tree | ea597b370e7feb318513927098bbc44c63dc96cb /gettext-tools/m4/javaexec.m4 | |
| parent | cad39a7e624dfd38bd6fb3a41d05383d82368712 (diff) | |
| download | external_gettext-79ec0b0f21fa417c8bfa277066f771dbc2adf623.zip external_gettext-79ec0b0f21fa417c8bfa277066f771dbc2adf623.tar.gz external_gettext-79ec0b0f21fa417c8bfa277066f771dbc2adf623.tar.bz2 | |
Add the ability to ignore JVMs that lack certain capabilities.
Diffstat (limited to 'gettext-tools/m4/javaexec.m4')
| -rw-r--r-- | gettext-tools/m4/javaexec.m4 | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/gettext-tools/m4/javaexec.m4 b/gettext-tools/m4/javaexec.m4 index 17cb7ab..0c06e9a 100644 --- a/gettext-tools/m4/javaexec.m4 +++ b/gettext-tools/m4/javaexec.m4 @@ -1,5 +1,5 @@ -# javaexec.m4 serial 1 (gettext-0.11) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. +# javaexec.m4 serial 2 (gettext-0.12.2) +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -7,6 +7,7 @@ dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. # Prerequisites of javaexec.sh. +# gt_JAVAEXEC or gt_JAVAEXEC(testclass, its-directory) # Sets HAVE_JAVAEXEC to nonempty if javaexec.sh will work. AC_DEFUN([gt_JAVAEXEC], @@ -31,23 +32,32 @@ AC_DEFUN([gt_JAVAEXEC], popdef([AC_MSG_RESULT])dnl popdef([AC_CHECKING])dnl popdef([AC_MSG_CHECKING])dnl + ifelse([$1], , , [ + save_CLASSPATH="$CLASSPATH" + CLASSPATH="$2"${CLASSPATH+"$CLASSPATH_SEPARATOR$CLASSPATH"} + ]) + export CLASSPATH if test -n "$HAVE_GIJ_IN_PATH" \ - && gij --version >/dev/null 2>/dev/null; then + && gij --version >/dev/null 2>/dev/null \ + ifelse([$1], , , [&& gij $1 >/dev/null 2>/dev/null]); then HAVE_GIJ=1 ac_result="gij" else if test -n "$HAVE_JAVA_IN_PATH" \ - && java -version >/dev/null 2>/dev/null; then + && java -version >/dev/null 2>/dev/null \ + ifelse([$1], , , [&& java $1 >/dev/null 2>/dev/null]); then HAVE_JAVA=1 ac_result="java" else if test -n "$HAVE_JRE_IN_PATH" \ - && (jre >/dev/null 2>/dev/null || test $? = 1); then + && (jre >/dev/null 2>/dev/null || test $? = 1) \ + ifelse([$1], , , [&& jre $1 >/dev/null 2>/dev/null]); then HAVE_JRE=1 ac_result="jre" else if test -n "$HAVE_JVIEW_IN_PATH" \ - && (jview -? >/dev/null 2>/dev/null || test $? = 1); then + && (jview -? >/dev/null 2>/dev/null || test $? = 1) \ + ifelse([$1], , , [&& jview $1 >/dev/null 2>/dev/null]); then HAVE_JVIEW=1 ac_result="jview" else @@ -57,6 +67,9 @@ AC_DEFUN([gt_JAVAEXEC], fi fi fi + ifelse([$1], , , [ + CLASSPATH="$save_CLASSPATH" + ]) fi AC_MSG_RESULT([$ac_result]) AC_SUBST(JAVA) |