diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-19 00:41:12 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-19 10:29:04 +0300 |
| commit | 08452f1208a2ecbf7c6f15a96efeedbe5210ec83 (patch) | |
| tree | fb09bce47d74d368ae9449bf4a5dc9e33c1ac1a8 /smoketest | |
| parent | a3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff) | |
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'smoketest')
| -rw-r--r-- | smoketest/Module_smoketest.mk | 4 | ||||
| -rw-r--r-- | smoketest/data/Basic/Standard/Global.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk index 6f10900f3035..52962a2b8eae 100644 --- a/smoketest/Module_smoketest.mk +++ b/smoketest/Module_smoketest.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Module_add_targets,smoketest,\ Zip_smoketestdoc \ )) -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,smoketest,\ Extension_TestExtension \ Jar_TestExtension \ @@ -40,7 +40,7 @@ endif endif -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,smoketest,\ Jar_smoketest \ )) diff --git a/smoketest/data/Basic/Standard/Global.xml b/smoketest/data/Basic/Standard/Global.xml index 64e6a3d1bf4e..16947bab2570 100644 --- a/smoketest/data/Basic/Standard/Global.xml +++ b/smoketest/data/Basic/Standard/Global.xml @@ -613,7 +613,7 @@ Sub SetDefaultOptions bMakeHTMLTest = true bMakeMathTest = true bMakeChartTest = true - if Environ("SOLAR_JAVA") = "" then + if Environ("ENABLE_JAVA") = "" then bMakeJavaTest = false bMakeDBTest = false bMakeExtensionTest = false |