]>
Commit | Line | Data |
---|---|---|
c9580293 JB |
1 | --- mutter-40.0/meson.build.orig 2021-04-04 18:15:31.375227070 +0200 |
2 | +++ mutter-40.0/meson.build 2021-04-04 18:55:31.768889688 +0200 | |
3 | @@ -426,20 +426,17 @@ | |
586b5247 JB |
4 | |
5 | # For Xwayland -initfd usage | |
6 | use_initfd = get_option('xwayland_initfd') | |
c9580293 JB |
7 | - if xwayland_dep.found() |
8 | - xwayland_supports_initfd = xwayland_dep.get_pkgconfig_variable('have_initfd') == 'true' | |
9 | - else | |
10 | - xwayland_options = run_command(xwayland_path, '-help') | |
11 | - xwayland_supports_initfd = xwayland_options.stderr().contains('-initfd') | |
12 | - endif | |
13 | - | |
586b5247 | 14 | if use_initfd.auto() |
c9580293 JB |
15 | + if xwayland_dep.found() |
16 | + xwayland_supports_initfd = xwayland_dep.get_pkgconfig_variable('have_initfd') == 'true' | |
17 | + else | |
18 | + xwayland_options = run_command(xwayland_path, '-help') | |
19 | + xwayland_supports_initfd = xwayland_options.stderr().contains('-initfd') | |
20 | + endif | |
21 | + | |
22 | have_xwayland_initfd = xwayland_supports_initfd | |
586b5247 JB |
23 | else |
24 | have_xwayland_initfd = use_initfd.enabled() | |
c9580293 | 25 | - if have_xwayland_initfd and not xwayland_supports_initfd |
586b5247 JB |
26 | - error('XWayland -initfd support requested but not available') |
27 | - endif | |
28 | endif | |
29 | ||
30 | if (have_xwayland_initfd) |