summaryrefslogtreecommitdiff
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-02-25 21:47:33 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2014-03-06 12:36:22 +0100
commitdcae0509135c2067635ae3cf84b05dc9fb3d2d02 (patch)
treebf27a61ace258b814b37e3cfc9980e047e9f4d4c /RepositoryExternal.mk
parent0b27253aff771e104a9fd5d17595b205b2fc39fd (diff)
Build webdav based on serf if neon is disabled.
Change-Id: I0cbb89c8d5ac65eda8bb21aaf0d07996a015d281
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index eec50bd83019..a4daea749060 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1000,7 +1000,9 @@ gb_LinkTarget__use_liblangtag :=
endif # ENABLE_LIBLANGTAG
-ifneq ($(DISABLE_NEON),)
+gb_ExternalProject__use_apr :=
+
+ifeq ($(WITH_WEBDAV),serf)
define gb_LinkTarget__use_apr
$(call gb_LinkTarget_set_include,$(1),\
@@ -1048,9 +1050,7 @@ endif
endef
-else
-
-gb_ExternalProject__use_apr :=
+else ifeq ($(WITH_WEBDAV),neon)
ifneq ($(SYSTEM_NEON),)
@@ -1088,7 +1088,7 @@ endef
endif # SYSTEM_NEON
-endif # DISABLE_NEON
+endif # WITH_WEBDAV
ifneq ($(SYSTEM_REDLAND),)