From 444753601c4c367ca395359ea74fe5c7b86ce56d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 13 Jun 2023 09:55:22 +0200 Subject: [PATCH] meson: implement HAVE_PTY This conditional was never implemented in the meson config. Under autotools, it is guarded by availability of headers and an option. I didn't implement the option here. Fixes #2310. '!= false' is used because 'x == 1' is rejected by meson if 'x' is false. OTOH, 'x != false' seems to work if 'x' is 1. --- meson.build | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index 2b59e2f015..78494773ca 100644 --- a/meson.build +++ b/meson.build @@ -709,6 +709,9 @@ int main(void) { have = cc.compiles(code, name : 'using __progname') conf.set('HAVE___PROGNAME', have ? 1 : false) +have = conf.get('HAVE_PTY_H') != false and conf.get('HAVE_SYS_SIGNALFD_H') != false +conf.set('HAVE_PTY', have ? 1 : false) + have_opal_get_status= cc.has_header_symbol('linux/sed-opal.h', 'IOC_OPAL_GET_STATUS') conf.set('HAVE_OPAL_GET_STATUS', have_opal_get_status ? 1 : false) @@ -3018,18 +3021,19 @@ exe = executable( link_with : lib_common) exes += exe -# XXX: HAVE_PTY -exe = executable( - 'test_pty', - pty_session_c, - monotonic_c, - c_args : ['-DTEST_PROGRAM_PTY'], - include_directories : dir_include, - link_with : [lib_common], - dependencies : [lib_m, - realtime_libs, - lib_util]) -exes += exe +if conf.get('HAVE_PTY') != false + exe = executable( + 'test_pty', + pty_session_c, + monotonic_c, + c_args : ['-DTEST_PROGRAM_PTY'], + include_directories : dir_include, + link_with : [lib_common], + dependencies : [lib_m, + realtime_libs, + lib_util]) + exes += exe +endif # XXX: LINUX exe = executable( -- 2.47.3