From 08452f1208a2ecbf7c6f15a96efeedbe5210ec83 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Mon, 19 Aug 2013 00:41:12 +0300
Subject: Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA

Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
---
 xmerge/Module_xmerge.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'xmerge')

diff --git a/xmerge/Module_xmerge.mk b/xmerge/Module_xmerge.mk
index 380df59d31f0..e92da2ae9cb5 100644
--- a/xmerge/Module_xmerge.mk
+++ b/xmerge/Module_xmerge.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_Module_Module,xmerge))
 
 $(eval $(call gb_Module_add_targets,xmerge,\
-	$(if $(SOLAR_JAVA), \
+	$(if $(ENABLE_JAVA), \
 		Jar_xmerge \
 		Jar_XMergeBridge \
 	) \
-- 
cgit