From 8ac7152ca8b3b71c17ea55ec9e660804990ab86c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@gmail.com>
Date: Sat, 8 Oct 2011 10:56:27 +0200
Subject: [PATCH] Don't build jars when java is disabled

---
 xmerge/Module_xmerge.mk | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/xmerge/Module_xmerge.mk b/xmerge/Module_xmerge.mk
index b5ef2789da5e..3b8503c5536b 100644
--- a/xmerge/Module_xmerge.mk
+++ b/xmerge/Module_xmerge.mk
@@ -29,11 +29,13 @@
 $(eval $(call gb_Module_Module,xmerge))
 
 $(eval $(call gb_Module_add_targets,xmerge,\
-	Jar_aportisdoc \
-	Jar_htmlsoff \
-	Jar_pexcel \
-	Jar_pocketword \
-	Jar_xmerge \
-	Jar_XMergeBridge \
+	$(if $(SOLAR_JAVA), \
+		Jar_aportisdoc \
+		Jar_htmlsoff \
+		Jar_pexcel \
+		Jar_pocketword \
+		Jar_xmerge \
+		Jar_XMergeBridge \
+	) \
 	Package_xmergesync \
 ))