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 d288fa2d8e4ffb6640143f8f2ddf2a846e24a4cf..5d0cb37866ef147b2945b10b16e829715310565e 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -292,6 +292,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 85b565bd6ea7511afe13b51cf29f422253cfc271..fbe5d11656eae56c4491d4ba9cd1f7a3a5181572 100644 (file)
Binary files a/configure.ac and b/configure.ac differ

diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 363a8a41dea19f35e012ff0602dd27615a356e1a..bd05d4bba2000cea0b24d273f9a51877bc20b13c 100644 (file)
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -62,10 +62,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\
 ifneq ($(filter $(OS),LINUX MACOSX),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \
     CustomTarget_build-examples \
+))
+ifneq ($(JAVA_HAS_ZERO_VM),y)
+$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \
     $(if $(ENABLE_JAVA),\
         CustomTarget_build-examples_java \
     ) \
 ))
 endif
+endif
 
 # vim: set noet sw=4 ts=4: