From 6542d39be48065193e9c64dcb6eb0d854a1242dc Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 20 Jun 2022 07:20:53 +0200 Subject: [PATCH] javacomp-script, javaexec-script: Add support for disabling Java. * m4/javacomp.m4 (gt_JAVACOMP_DISABLED): New macro. * m4/javaexec.m4 (gt_JAVAEXEC_DISABLED): New macro. --- ChangeLog | 6 ++++++ m4/javacomp.m4 | 17 ++++++++++++++++- m4/javaexec.m4 | 19 ++++++++++++++++++- 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a6434ad88..be124ac039 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2022-06-20 Bruno Haible + + javacomp-script, javaexec-script: Add support for disabling Java. + * m4/javacomp.m4 (gt_JAVACOMP_DISABLED): New macro. + * m4/javaexec.m4 (gt_JAVAEXEC_DISABLED): New macro. + 2022-06-19 Paul Eggert lchmod: port back to AIX 7.2 diff --git a/m4/javacomp.m4 b/m4/javacomp.m4 index 1fd7589f5d..396e0866ed 100644 --- a/m4/javacomp.m4 +++ b/m4/javacomp.m4 @@ -1,4 +1,4 @@ -# javacomp.m4 serial 18 +# javacomp.m4 serial 19 dnl Copyright (C) 2001-2003, 2006-2007, 2009-2022 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -736,3 +736,18 @@ changequote([,])dnl AC_SUBST([HAVE_JAVAC]) AC_SUBST([HAVE_JIKES]) ]) + +# Simulates gt_JAVACOMP when no Java support is desired. +AC_DEFUN([gt_JAVACOMP_DISABLED], +[ + CONF_JAVAC= + HAVE_JAVAC_ENVVAR= + HAVE_GCJ_C= + HAVE_JAVAC= + HAVE_JIKES= + AC_SUBST([CONF_JAVAC]) + AC_SUBST([HAVE_JAVAC_ENVVAR]) + AC_SUBST([HAVE_GCJ_C]) + AC_SUBST([HAVE_JAVAC]) + AC_SUBST([HAVE_JIKES]) +]) diff --git a/m4/javaexec.m4 b/m4/javaexec.m4 index 6ed7f64993..960a15e4c6 100644 --- a/m4/javaexec.m4 +++ b/m4/javaexec.m4 @@ -1,4 +1,4 @@ -# javaexec.m4 serial 7 +# javaexec.m4 serial 8 dnl Copyright (C) 2001-2003, 2006, 2009-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -102,3 +102,20 @@ AC_DEFUN([gt_JAVAEXEC], AC_SUBST([HAVE_JRE]) AC_SUBST([HAVE_JVIEW]) ]) + +# Simulates gt_JAVAEXEC when no Java support is desired. +AC_DEFUN([gt_JAVAEXEC_DISABLED], +[ + CONF_JAVA= + HAVE_JAVA_ENVVAR= + 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]) +]) -- 2.39.5