diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-25 21:47:33 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-06 12:36:22 +0100 |
commit | dcae0509135c2067635ae3cf84b05dc9fb3d2d02 (patch) | |
tree | bf27a61ace258b814b37e3cfc9980e047e9f4d4c /postprocess | |
parent | Add apr and serf externals for alternative webdav implementation. (diff) | |
download | core-dcae0509135c2067635ae3cf84b05dc9fb3d2d02.tar.gz core-dcae0509135c2067635ae3cf84b05dc9fb3d2d02.zip |
Build webdav based on serf if neon is disabled.
Change-Id: I0cbb89c8d5ac65eda8bb21aaf0d07996a015d281
Diffstat (limited to 'postprocess')
-rw-r--r-- | postprocess/CustomTarget_registry.mk | 2 | ||||
-rwxr-xr-x | postprocess/Rdb_services.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index ebd2afeb9bab..76f722c8b64f 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -335,7 +335,7 @@ ifneq (unx,$(GUIBASE)) postprocess_FILES_main += \ $(postprocess_MOD)/org/openoffice/Office/Paths-notunixdesktop.xcu endif -ifeq ($(DISABLE_NEON),$(false)) +ifneq ($(WITH_WEBDAV),) postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu endif ifeq ($(ENABLE_EVOAB2),TRUE) diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 41f30777cef6..f6a9b17be901 100755 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -152,7 +152,7 @@ $(eval $(call gb_Rdb_add_components,services,\ winaccessibility/source/service/winaccessibility \ ) \ ) \ - $(if $(DISABLE_NEON),, \ + $(if $(WITH_WEBDAV), \ ucb/source/ucp/webdav-neon/ucpdav1 \ ) \ $(if $(DISABLE_SCRIPTING),, \ |