From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Tue, 24 Apr 2018 09:46:54 +0000 (+0100)
Subject: disable-java-in-odk-build-examples-on-zero-vm
X-Git-Tag: archive/raspbian/1%6.0.4_rc1-4+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6b1c4577bd1a3bd449fea29143d5daf449b5c975;p=libreoffice.git

disable-java-in-odk-build-examples-on-zero-vm


Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff
---

diff --git a/config_host.mk.in b/config_host.mk.in
index bc21158c23e..4502165881f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -284,6 +284,7 @@ export JAVAFLAGS=@JAVAFLAGS@
 export JAVAIFLAGS=@JAVAIFLAGS@
 export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@
 export JAVAINTERPRETER=@JAVAINTERPRETER@
+export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@
 export JAVA_HOME=@JAVA_HOME@
 export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@
 export JAVA_TARGET_VER=@JAVA_TARGET_VER@
diff --git a/configure.ac b/configure.ac
index ffa66f69788..f9ccebcf310 100644
Binary files a/configure.ac and b/configure.ac differ
diff --git a/odk/CustomTarget_build-examples.mk b/odk/CustomTarget_build-examples.mk
index f7dc1db1e30..338a3bd02c9 100644
--- a/odk/CustomTarget_build-examples.mk
+++ b/odk/CustomTarget_build-examples.mk
@@ -32,6 +32,7 @@ my_example_dirs = \
 
 
 ifeq ($(ENABLE_JAVA),TRUE)
+ifneq ($(JAVA_HAS_ZERO_VM),y)
 my_example_dirs += \
     DevelopersGuide/BasicAndDialogs/CreatingDialogs \
     DevelopersGuide/Charts \
@@ -77,6 +78,7 @@ my_example_dirs += \
     java/ToDo \
 
 endif
+endif
 
 #    java/ConverterServlet \
 #    java/EmbedDocument/Container1 \