[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/19] configure / meson: Move check for drm.h to meson.build
From: |
Laurent Vivier |
Subject: |
[PULL 16/19] configure / meson: Move check for drm.h to meson.build |
Date: |
Mon, 14 Dec 2020 16:57:30 +0100 |
From: Thomas Huth <thuth@redhat.com>
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>
---
configure | 10 ----------
meson.build | 1 +
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/configure b/configure
index 39e61b275806..ec2fae9e09c0 100755
--- a/configure
+++ b/configure
@@ -3101,13 +3101,6 @@ EOF
fi
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
@@ -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 ef053c98376d..fc7ae6f86826 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'))
--
2.29.2
- [PULL 00/19] Trivial branch for 6.0 patches, Laurent Vivier, 2020/12/14
- [PULL 02/19] qemu-options.hx: Fix minor issues in icount documentation, Laurent Vivier, 2020/12/14
- [PULL 07/19] CODING_STYLE.rst: Be less strict about 80 character limit, Laurent Vivier, 2020/12/14
- [PULL 04/19] hw/xen: Don't use '#' flag of printf format, Laurent Vivier, 2020/12/14
- [PULL 14/19] configure: Remove the obsolete check for ifaddrs.h, Laurent Vivier, 2020/12/14
- [PULL 15/19] configure / meson: Move check for pty.h to meson.build, Laurent Vivier, 2020/12/14
- [PULL 16/19] configure / meson: Move check for drm.h to meson.build,
Laurent Vivier <=
- [PULL 01/19] target/i386: tracing: format length values as hex, Laurent Vivier, 2020/12/14
- [PULL 05/19] hw/pci-host/pam: Replace magic number by PAM_REGIONS_COUNT definition, Laurent Vivier, 2020/12/14
- [PULL 03/19] MAINTAINERS: update my email address, Laurent Vivier, 2020/12/14
- [PULL 19/19] configure / meson: Move check for linux/btrfs.h to meson.build, Laurent Vivier, 2020/12/14
- [PULL 18/19] configure / meson: Move check for sys/kcov.h to meson.build, Laurent Vivier, 2020/12/14
- [PULL 11/19] elf2dmp/pdb: Plug memleak in pdb_init_from_file, Laurent Vivier, 2020/12/14
- [PULL 09/19] configure: Test if $make actually exists, Laurent Vivier, 2020/12/14
- [PULL 10/19] elf2dmp/qemu_elf: Plug memleak in QEMU_Elf_init, Laurent Vivier, 2020/12/14
- [PULL 17/19] configure / meson: Move check for sys/signal.h to meson.build, Laurent Vivier, 2020/12/14
- [PULL 08/19] ads7846: moves from the hw/display folder to the hw/input folder., Laurent Vivier, 2020/12/14