summaryrefslogtreecommitdiff
path: root/Library_merged.mk
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 /Library_merged.mk
parenta3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff)
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'Library_merged.mk')
-rw-r--r--Library_merged.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index 26dbb5c0c071..1e961111f30c 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
cppu \
cppuhelper \
i18nlangtag \
- $(if $(filter TRUE,$(SOLAR_JAVA)), \
+ $(if $(ENABLE_JAVA), \
jvmaccess \
jvmfwk) \
sal \