]> git.ipfire.org Git - thirdparty/gettext.git/commitdiff
Avoid warnings during configure execution with --disable-java.
authorBruno Haible <bruno@clisp.org>
Mon, 10 Oct 2022 23:54:44 +0000 (01:54 +0200)
committerBruno Haible <bruno@clisp.org>
Mon, 10 Oct 2022 23:54:44 +0000 (01:54 +0200)
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.

gettext-runtime/configure.ac
gettext-tools/configure.ac

index e0afe2e3062d6b651247cbe2f9fa4e5232d828de..4f2267260310de91fdbd372da62fd8f5b0681c92 100644 (file)
@@ -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
 ])
index 266580c934de32229b7434eb89070648c8bb7f59..a4d7e1c2e242ea63ce09c9dfff31bbe0f7b3b3ee 100644 (file)
@@ -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
 ])