diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-25 21:47:33 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-04-02 15:35:22 +0200 |
| commit | 5c85ba488732e41c31af50ca3013d3fcce2a7e0f (patch) | |
| tree | 40346bebc11642a5acea49e5cd4add568981c179 /RepositoryExternal.mk | |
| parent | Add apr and serf externals for alternative webdav implementation. (diff) | |
| download | core-5c85ba488732e41c31af50ca3013d3fcce2a7e0f.tar.gz core-5c85ba488732e41c31af50ca3013d3fcce2a7e0f.zip | |
Build webdav based on serf if neon is disabled.
(cherry picked from commit dcae0509135c2067635ae3cf84b05dc9fb3d2d02)
Conflicts:
Repository.mk
postprocess/CustomTarget_registry.mk
ucb/Module_ucb.mk
ucb/source/ucp/webdav/webdavservices.cxx
Change-Id: I0cbb89c8d5ac65eda8bb21aaf0d07996a015d281
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index cb0b4b552bc8..23bee81cd501 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -902,7 +902,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),\ @@ -950,9 +952,7 @@ endif endef -else - -gb_ExternalProject__use_apr := +else ifeq ($(WITH_WEBDAV),neon) ifeq ($(SYSTEM_NEON),YES) @@ -990,7 +990,7 @@ endef endif # SYSTEM_NEON -endif # DISABLE_NEON +endif # WITH_WEBDAV ifeq ($(SYSTEM_REDLAND),YES) |