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
---
 extensions/Library_pl.mk            | 4 ++--
 extensions/StaticLibrary_plugcon.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'extensions')

diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index 102217a50fe2..040a47a32989 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -25,12 +25,12 @@ $(eval $(call gb_Library_set_include,pl,\
 
 $(eval $(call gb_Library_use_sdk_api,pl))
 
-ifeq ($(SOLAR_JAVA),TRUE)
+ifeq ($(ENABLE_JAVA),TRUE)
 $(eval $(call gb_Library_add_defs,pl,\
 	-DOJI \
 ))
 
-endif # SOLAR_JAVA=YES
+endif # ENABLE_JAVA=YES
 
 ifeq ($(SYSTEM_MOZILLA),YES)
 $(eval $(call gb_Library_add_defs,pl,\
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk
index 13d2c057ff30..3547593841e8 100644
--- a/extensions/StaticLibrary_plugcon.mk
+++ b/extensions/StaticLibrary_plugcon.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_StaticLibrary_use_api,plugcon,\
 	udkapi \
 ))
 
-ifeq ($(SOLAR_JAVA),TRUE)
+ifeq ($(ENABLE_JAVA),TRUE)
 $(eval $(call gb_StaticLibrary_add_defs,plugcon,\
 	-DOJI \
 ))
 
-endif # SOLAR_JAVA=YES
+endif # ENABLE_JAVA=YES
 
 ifeq ($(SYSTEM_MOZILLA),YES)
 $(eval $(call gb_StaticLibrary_add_defs,plugcon,\
-- 
cgit