aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2020-11-18 18:10:50 +0100
committerLaurent Vivier <laurent@vivier.eu>2020-12-13 23:56:16 +0100
commit88c78f162a564ae17b3369b88c85e567d98ff9c7 (patch)
treeb795d38cdef317200a2affa93c877a4a7f92068a
parent2964be527aecc10c89d7d99d186a2c36333d5e87 (diff)
configure / meson: Move check for sys/signal.h to meson.build
This check can be done in a much shorter way in meson.build Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20201118171052.308191-5-thuth@redhat.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
-rwxr-xr-xconfigure10
-rw-r--r--meson.build1
2 files changed, 1 insertions, 10 deletions
diff --git a/configure b/configure
index ec2fae9e09..4f0f9c99d3 100755
--- a/configure
+++ b/configure
@@ -3101,13 +3101,6 @@ EOF
fi
fi
-#########################################
-# sys/signal.h check
-have_sys_signal_h=no
-if check_include "sys/signal.h" ; then
- have_sys_signal_h=yes
-fi
-
##########################################
# VTE probe
@@ -6204,9 +6197,6 @@ fi
if test "$have_openpty" = "yes" ; then
echo "HAVE_OPENPTY=y" >> $config_host_mak
fi
-if test "$have_sys_signal_h" = "yes" ; then
- echo "HAVE_SYS_SIGNAL_H=y" >> $config_host_mak
-fi
# Work around a system header bug with some kernel/XFS header
# versions where they both try to define 'struct fsxattr':
diff --git a/meson.build b/meson.build
index fc7ae6f868..a790cc527c 100644
--- a/meson.build
+++ b/meson.build
@@ -839,6 +839,7 @@ config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('.')[2]
config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h'))
config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h'))
config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h'))
+config_host_data.set('HAVE_SYS_SIGNAL_H', cc.has_header('sys/signal.h'))
ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target
arrays = ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']