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 bc21158c23e8b8b12d6487bac85e83c50c5267d3..4502165881f3521b32f9261a4fb2e901d7c735e3 100644 (file)
--- 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 724240baa9213ffb0f1a0ee89b1384891af88834..35c45173397f448d9843946aefa3f51fd61cf00f 100644 (file)
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 f7dc1db1e30d4a4fb5a3f9e7f66205ee950ff2a8..338a3bd02c99ec7401bb4cefdc2fe326dd078270 100644 (file)
--- 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 \