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-04 11:34:36 +0200 |
| commit | a783cea3300ca854fc988e7c47bec088fb457444 (patch) | |
| tree | 2d37c2bbb9a3a1d2e0470a9ca8f3e54be7ce2d18 /Repository.mk | |
| parent | e5884f866f08c6df1dd8884060a4e7b69a510a93 (diff) | |
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 'Repository.mk')
| -rw-r--r-- | Repository.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk index 072d8b7f2e9d..c74ffb1ccad1 100644 --- a/Repository.mk +++ b/Repository.mk @@ -505,6 +505,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,OOO, \ sofficeapp \ ucb1 \ ucbhelper \ + $(if $(WITH_WEBDAV),ucpdav1) \ ucpfile1 \ xstor \ )) @@ -541,7 +542,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ srtrs1 \ textconv_dict \ tvhlp1 \ - ucpdav1 \ ucpftp1 \ ucpchelp1 \ ucphier1 \ |