* build-aux/javaexec.sh.in: Don't test HAVE_JVIEW.
* m4/javaexec.m4 (gt_JAVAEXEC): Don't set HAVE_JVIEW. Don't set
CONF_JAVA to 'jview'.
(gt_JAVAEXEC_DISABLED): Don't set HAVE_JVIEW.
* m4/javacomp.m4: Update comment.
+2023-06-09 Bruno Haible <bruno@clisp.org>
+
+ javaexec-script: Remove support for 'jview'.
+ * build-aux/javaexec.sh.in: Don't test HAVE_JVIEW.
+ * m4/javaexec.m4 (gt_JAVAEXEC): Don't set HAVE_JVIEW. Don't set
+ CONF_JAVA to 'jview'.
+ (gt_JAVAEXEC_DISABLED): Don't set HAVE_JVIEW.
+ * m4/javacomp.m4: Update comment.
+
2023-06-06 Jim Meyering <meyering@meta.com>
maint.mk: regenerate regex to reflect new functions in xalloc.h
test -z "$JAVA_VERBOSE" || echo "$CONF_JAVA $@"
exec $CONF_JAVA "$@"
else
- if test -n "@HAVE_JVIEW@"; then
- # 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
- fi
+ echo 'Java virtual machine not found, try installing gij or set $JAVA, then reconfigure' 1>&2
+ exit 1
fi
fi
fi
-# javacomp.m4 serial 19
+# javacomp.m4 serial 20
dnl Copyright (C) 2001-2003, 2006-2007, 2009-2023 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
# target-version can also be omitted. In this case, the required target-version
# is determined from the found JVM (see macro gt_JAVAEXEC):
# target-version for JVM
-# 1.1 JDK 1.1, jview
+# 1.1 JDK 1.1
# 1.2 JDK/JRE 1.2
# 1.3 JDK/JRE 1.3, gij 3.3, 3.4
# 1.4 JDK/JRE 1.4, gij 4.0 ... 4.2
-# javaexec.m4 serial 8
+# javaexec.m4 serial 9
dnl Copyright (C) 2001-2003, 2006, 2009-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
HAVE_GIJ=
HAVE_JAVA=
HAVE_JRE=
- HAVE_JVIEW=
HAVE_JAVAEXEC=1
if test -n "$JAVA"; then
HAVE_JAVA_ENVVAR=1
AC_CHECK_PROG([HAVE_GIJ_IN_PATH], [gij], [yes])
AC_CHECK_PROG([HAVE_JAVA_IN_PATH], [java], [yes])
AC_CHECK_PROG([HAVE_JRE_IN_PATH], [jre], [yes])
- AC_CHECK_PROG([HAVE_JVIEW_IN_PATH], [jview], [yes])
popdef([AC_MSG_RESULT])dnl
popdef([AC_CHECKING])dnl
popdef([AC_MSG_CHECKING])dnl
HAVE_JRE=1
CONF_JAVA="jre"
else
- if test -n "$HAVE_JVIEW_IN_PATH" \
- && (jview -? >/dev/null 2>/dev/null || test $? = 1) \
- m4_if([$1], , , [&& {
- echo "$as_me:__oline__: gij $1" >&AS_MESSAGE_LOG_FD
- jview $1 >&AS_MESSAGE_LOG_FD 2>&1
- }]); then
- HAVE_JVIEW=1
- CONF_JAVA="jview"
- else
- HAVE_JAVAEXEC=
- fi
+ HAVE_JAVAEXEC=
fi
fi
fi
AC_SUBST([HAVE_GIJ])
AC_SUBST([HAVE_JAVA])
AC_SUBST([HAVE_JRE])
- AC_SUBST([HAVE_JVIEW])
])
# Simulates gt_JAVAEXEC when no Java support is desired.
HAVE_GIJ=
HAVE_JAVA=
HAVE_JRE=
- HAVE_JVIEW=
AC_SUBST([CONF_JAVA])
AC_SUBST([HAVE_JAVA_ENVVAR])
AC_SUBST([HAVE_GIJ])
AC_SUBST([HAVE_JAVA])
AC_SUBST([HAVE_JRE])
- AC_SUBST([HAVE_JVIEW])
])