diff options
| author | Laurent Carlier <lordheavym@gmail.com> | 2018-06-16 13:00:01 +0200 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2018-06-28 15:15:49 +1000 |
| commit | 2f39b2a07805194fdd7def30d941666963d6e670 (patch) | |
| tree | 23dfdbc4ea9d232353ae76867a6fe01a9ed19af5 | |
| parent | c41d4ff48f72aa964afd131b59e1538295d062dc (diff) | |
meson: Add configuration of listening on tcp, unix and local
bugzilla: https://bugs.kde.org/show_bug.cgi?id=395419
bugzilla: https://bugs.archlinux.org/task/59025
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | include/meson.build | 6 | ||||
| -rw-r--r-- | meson_options.txt | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/include/meson.build b/include/meson.build index f76f557be..dfca3c340 100644 --- a/include/meson.build +++ b/include/meson.build @@ -153,10 +153,10 @@ conf_data.set('BUSFAULT', conf_data.get('HAVE_SIGACTION')) conf_data.set('_XTYPEDEF_POINTER', '1') conf_data.set('_XITYPEDEF_POINTER', '1') +conf_data.set('LISTEN_TCP', get_option('listen_tcp')) +conf_data.set('LISTEN_UNIX', get_option('listen_unix')) +conf_data.set('LISTEN_LOCAL', get_option('listen_local')) # XXX: Configurable? -conf_data.set('LISTEN_TCP', '1') -conf_data.set('LISTEN_UNIX', '1') -conf_data.set('LISTEN_LOCAL', '1') conf_data.set('XTRANS_SEND_FDS', '1') conf_data.set('TCPCONN', '1') diff --git a/meson_options.txt b/meson_options.txt index 86fca4668..3453b8df5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -45,6 +45,13 @@ option('vendor_name_short', type: 'string', value: 'X.Org') option('vendor_web', type: 'string', value: 'http://wiki.x.org') option('os_vendor', type: 'string', value: '') +option('listen_tcp', type: 'boolean', value: false, + description: 'Listen on TCP by default') +option('listen_unix', type: 'boolean', value: true, + description: 'Listen on Unix by default') +option('listen_local', type: 'boolean', value: true, + description: 'Listen on local by default') + option('int10', type: 'combo', choices: ['stub', 'x86emu', 'vm86', 'auto', 'false'], value: 'auto', description: 'Xorg int10 backend (default: usually x86emu)') |