summaryrefslogtreecommitdiff
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-07-08 11:20:19 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-07-08 12:06:04 +0000
commitecc617e797aa5ed329668114e54ec7ffa5c0e87b (patch)
treeb8c391c66ce89aa17bacd75e769d9f611f6e4481 /RepositoryExternal.mk
parent8caef148f4ce5f811588390c24bda41a1390093d (diff)
configmgr: support reading from a dconf layer (WIP)
Work in progress to allow integration of LO with <https://wiki.gnome.org/Projects/FleetCommander>. During configuration, dconf support is implicitly enabled when available on the host (which is presumably only available on Linux). It is explicitly disabled for TDF Linux builds for now, though, to avoid accidental dependencies of the distributed installation sets on system dconf libraries. A dconf layer is represented in the CONFIGURATION_LAYERS bootstrap variable with type "dconf" and an empty URL. See the comment at the top of configmgr/source/readdconflayer.cxx for the encoding of component-data in dconf. All of this is still subject to change. Change-Id: I2d08d81c8ea43ba4a99040a8882ae75b91bcfdb9 Reviewed-on: https://gerrit.libreoffice.org/16848 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a0a0d611413b..75f033f4a193 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3584,6 +3584,11 @@ endif # ENABLE_COLLADA
endif # ENABLE_GLTF
+define gb_LinkTarget__use_dconf
+$(call gb_LinkTarget_add_defs,$(1),$(DCONF_CFLAGS))
+$(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS))
+endef
+
### Jars ############################################################
ifneq ($(SYSTEM_HSQLDB),)