diff options
| author | Olivier Fourdan <ofourdan@redhat.com> | 2023-11-17 11:54:54 +0100 |
|---|---|---|
| committer | Olivier Fourdan <ofourdan@redhat.com> | 2023-11-29 11:32:05 +0100 |
| commit | 7883646a8f208a1db4cb98f8b295c7f862da3b2a (patch) | |
| tree | 35ac21ac23261d55ff6ecd5ae0801e53ba7125f3 /meson_options.txt | |
| parent | 074c2a1e502e3139a6e9d90941c19b9b80d22226 (diff) | |
build: Allow for custom server config directory
Most X servers, even those which do not have specific configuration
files, can use the directory specified by SERVER_MISC_CONFIG_PATH when
they have either the XSECURITY or XSELINUX extensions enabled, or when
support for DTRACE is enabled at build time, because this is also where
the "protocol.txt" file is searched for at runtime.
Unfortunately, the SERVER_MISC_CONFIG_PATH is set from serverconfigdir
which is hardcoded in the build system to "$prefix/$libdir/xorg", and
all X server builds share the same path.
That makes it harder for different X servers such as Xwayland to install
in the same path without sharing the same server configuration path
(and hence the same "protocol.txt" file).
Allow for the customization of server configuration path from the build
options so that different X servers can use completely different and
independent paths.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 411a61f571aa1dde54d52b0200a4e1a9d0def336)
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meson_options.txt b/meson_options.txt index 1d0de5206..af094df70 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -14,6 +14,8 @@ option('builder_string', type: 'string', description: 'Additional builder string option('default_font_path', type: 'string') option('fontrootdir', type: 'string', description: 'Root directory for legacy fonts. Default: from font-utils.pc or $datadir/fonts/X11') +option('serverconfigdir', type: 'string', + description: 'Miscellaneous server configuration files path. Default: $libdir/xorg') option('glx', type: 'boolean', value: true) option('xdmcp', type: 'boolean', value: true) |