diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-07-08 11:20:19 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-07-08 12:06:04 +0000 |
| commit | ecc617e797aa5ed329668114e54ec7ffa5c0e87b (patch) | |
| tree | b8c391c66ce89aa17bacd75e769d9f611f6e4481 /config_host.mk.in | |
| parent | 8caef148f4ce5f811588390c24bda41a1390093d (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 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 1d0702b4f728..2a20b8bfdd51 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -91,6 +91,8 @@ export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@ export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@ export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@ export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@ +export DCONF_CFLAGS=@DCONF_CFLAGS@ +export DCONF_LIBS=@DCONF_LIBS@ export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@ export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@ export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@ @@ -122,6 +124,7 @@ export ENABLE_CUPS=@ENABLE_CUPS@ export ENABLE_CURL=@ENABLE_CURL@ export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@ export ENABLE_DBUS=@ENABLE_DBUS@ +export ENABLE_DCONF=@ENABLE_DCONF@ export ENABLE_DEBUG=@ENABLE_DEBUG@ export ENABLE_DEBUGINFO_FOR=@ENABLE_DEBUGINFO_FOR@ export ENABLE_DIRECTX=@ENABLE_DIRECTX@ |