summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-08-19 00:41:12 +0300
committerTor Lillqvist <tml@iki.fi>2013-08-19 10:29:04 +0300
commit08452f1208a2ecbf7c6f15a96efeedbe5210ec83 (patch)
treefb09bce47d74d368ae9449bf4a5dc9e33c1ac1a8 /extensions
parenta3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff)
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'extensions')
-rw-r--r--extensions/Library_pl.mk4
-rw-r--r--extensions/StaticLibrary_plugcon.mk4
2 files changed, 4 insertions, 4 deletions
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,\