[Libreoffice-commits] .: Branch 'libreoffice-3-5' - RepositoryModule_ooo.mk

[René Engelhard]

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

New commits:
commit cdebe172bf0e276983421f73e62ffcae84c6cbcb
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 f59b2e0..5f7fa6f 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -67,7 +67,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     package \
     padmin \
     psprint_config \
-    qadevOOo \
     regexp \
     reportdesign \
     sane \
@@ -108,6 +107,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,\
     configmgr \