[Libreoffice-commits] .: RepositoryModule_ooo.mk

[René Engelhard]

 RepositoryModule_ooo.mk |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0f2d6f6323e93fa688cd00d0db683f81ccec8fd2
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Dec 30 16:01:28 2011 +0100

    build qadevOOo only if SOLAR_JAVA and OOO_JUNIT_JAR are set

diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 947a06e..d44e041 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     package \
     padmin \
     psprint_config \
-    qadevOOo \
     regexp \
     reportdesign \
     sal \
@@ -117,6 +116,14 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     xmlscript \
 ))
 
+ifneq ($(SOLAR_JAVA),)
+ ifneq "$(OOO_JUNIT_JAR)" ""
+$(eval $(call gb_Module_add_moduledirs,ooo,\
+    qadevOOo \
+))
+  endif
+endif
+
 # these have only migrated subsequentcheck for now
 $(eval $(call gb_Module_add_moduledirs,ooo,\
     ucb \