summaryrefslogtreecommitdiff
path: root/postprocess
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-08-27 12:34:30 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-08-27 12:34:30 +0200
commit5e19fa2ffe890731bdc5a7b0a3b281696f36cbe2 (patch)
tree74a40b068be7bef0be9fd549dc76b8feab75aeb3 /postprocess
parent44994d951179f5cf32db7ead8912c3fd0e7e2afd (diff)
Restrict the install:module="neon_gnomevfs" hack to --with-webdav=neon
...as the underlying problem, according to <https://bz.apache.org/ooo/show_bug.cgi?id=84676> "mixing neon and the hidden embedded contents old [sic] another neon inside libhttp.so of gnome-vfs2 is unreliable," presumably does not affect --with-webdav=serf Change-Id: I2abfeaeac5174a735f46b2838bd84dda0af9a487
Diffstat (limited to 'postprocess')
-rw-r--r--postprocess/CustomTarget_registry.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 5a2c36e0e11d..eb2e51764b5d 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -329,10 +329,12 @@ postprocess_DRIVERS += ado
endif
ifneq ($(WITH_WEBDAV),)
postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu
+ifeq ($(WITH_WEBDAV),neon)
ifeq ($(ENABLE_GNOMEVFS),TRUE)
postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon_gnomevfs.xcu
endif
endif
+endif
ifeq ($(ENABLE_EVOAB2),TRUE)
postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu