summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2022-10-11 01:54:44 +0200
committerBruno Haible <bruno@clisp.org>2022-10-11 01:54:44 +0200
commitb8fc039e4266570f5af5ee1c2cd201369a766f1e (patch)
treeacbe2122bd39a7f7de17da77604a9f421098d252
parent8b38ee827251cadbb90cb6cb576ae98702566288 (diff)
downloadgettext-b8fc039e4266570f5af5ee1c2cd201369a766f1e.tar.gz
Avoid warnings during configure execution with --disable-java.
Reported by Sam James <sam@cmpct.info> in <https://savannah.gnu.org/bugs/?63193>. * gettext-runtime/configure.ac: Expand gt_JAVACOMP_DISABLED inline. * gettext-tools/configure.ac: Expand gt_JAVAEXEC_DISABLED and gt_JAVACOMP_DISABLED inline.
-rw-r--r--gettext-runtime/configure.ac11
-rw-r--r--gettext-tools/configure.ac24
2 files changed, 32 insertions, 3 deletions
diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index e0afe2e30..4f2267260 100644
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -42,7 +42,16 @@ AS_IF([test "$JAVA_CHOICE" != no], [
BUILDJAVA=no
fi
], [
- 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])
JAR=
BUILDJAVA=no
])
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 266580c93..a4d7e1c2e 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -43,8 +43,28 @@ AS_IF([test "$JAVA_CHOICE" != no], [
BUILDJAVA=no
fi
], [
- gt_JAVAEXEC_DISABLED
- gt_JAVACOMP_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])
+ 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])
JAR=
BUILDJAVA=no
])