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 8226e42306915160fed74151594d8db6633f0fdf..330116d592f3e82c6b2fa82a6d9a579c0cfe4b10 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -331,6 +331,7 @@ export JAVAIFLAGS=@JAVAIFLAGS@
 export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS_FOR_BUILD@
 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_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@
 export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@

diff --git a/configure.ac b/configure.ac
index 7232923a1694f33314ad25dcedbdf4f03dbe9854..1875759831bc968544d1e275d0657e2066585cfa 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 0d5fca58d2ce2c6b2eeadfd88b56ef98e0e5f586..6bbe1e826e314250e4a8bb5778326aae75130fd1 100644 (file)
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -59,10 +59,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: