aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2020-11-18 18:10:49 +0100
committerLaurent Vivier <laurent@vivier.eu>2020-12-13 23:56:16 +0100
commit2964be527aecc10c89d7d99d186a2c36333d5e87 (patch)
tree863f9b5bc5c46a49635461a6f375e06d111c39bf
parent2802d91d515f3e51a8b3515a35e79c2c676da9e5 (diff)
configure / meson: Move check for drm.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-4-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 39e61b2758..ec2fae9e09 100755
--- a/configure
+++ b/configure
@@ -3102,13 +3102,6 @@ EOF
fi
#########################################
-# libdrm check
-have_drm_h=no
-if check_include "libdrm/drm.h" ; then
- have_drm_h=yes
-fi
-
-#########################################
# sys/signal.h check
have_sys_signal_h=no
if check_include "sys/signal.h" ; then
@@ -6205,9 +6198,6 @@ fi
if test "$auth_pam" = "yes" ; then
echo "CONFIG_AUTH_PAM=y" >> $config_host_mak
fi
-if test "$have_drm_h" = "yes" ; then
- echo "HAVE_DRM_H=y" >> $config_host_mak
-fi
if test "$have_broken_size_max" = "yes" ; then
echo "HAVE_BROKEN_SIZE_MAX=y" >> $config_host_mak
fi
diff --git a/meson.build b/meson.build
index ef053c9837..fc7ae6f868 100644
--- a/meson.build
+++ b/meson.build
@@ -836,6 +836,7 @@ config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('.')[0]
config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('.')[1])
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'))