From 9475fb9140deee3387fa5cd80a03d5c2d2dbc21b Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 7 May 2018 14:47:22 +0100
Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm

Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff
---
 config_host.mk.in                  |   1 +
 configure.ac                       | Bin 450425 -> 450713 bytes
 odk/CustomTarget_build-examples.mk |   2 ++
 3 files changed, 3 insertions(+)

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 90a6dea9d554433a8fc3ace51b717e932d8f93ca..054c8a522bb6e879e19eeec22648b93dc2421f49 100644
GIT binary patch
delta 203
zcmeylPkQD->4p}@7N#xC)B2|i^0KHIsCYSsIePkqxCR9TxdKUr%wmPo;>^5sg_4X^
zg{ah`e1$OISWPZY1t7>wQ<$#M#;mB3UX)s(pj!x*w+5-q<KpB5nH2Bg7#ttv8sr}z
z=4)HYHJ$M)tK9Sp87zX+ZTuKTrVCtURha(Z6tmFu3pp$zlOLF|Pe0JlTq^1493LF&
f6da;~ZpQSFd)R{7TPH9BF$)m0Zf~8y_QekX?W;rl

delta 52
zcmbPvQ2OUS>4p}@7N#xC)B2}7ZDv)T{J@NT`q2r@rPIIEv-q|zn#c^qEI`b<ebGd=
G?|uMe;1@vv

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 \
-- 
2.30.2