xserver: Branch 'master'

[GitLab Mirror]

 include/meson.build |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 04c93b98e9e4593aa2e6701bb08f5e27c3544d8a
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Sat Nov 13 16:42:36 2021 +0200

    meson: Correctly set DDXOSVERRORF and DDXBEFORERESET on xwin
    
    This worked with autotools, but not meson build system.
    
    Signed-off-by: Povilas Kanapickas <povilas at radix.lt>

diff --git a/include/meson.build b/include/meson.build
index 6f52a7aea..309a5d5b0 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -247,6 +247,8 @@ conf_data.set('HAVE_LIBUNWIND', get_option('libunwind'))
 conf_data.set('HAVE_APM', (build_apm or build_acpi) ? '1' : false)
 conf_data.set('HAVE_ACPI', build_acpi ? '1' : false)
 
+conf_data.set('DDXOSVERRORF', build_xwin ? '1' : false)
+conf_data.set('DDXBEFORERESET', build_xwin ? '1' : false)
 enable_debugging = get_option('buildtype') == 'debug'
 conf_data.set('DEBUG', enable_debugging ? '1' : false)