[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/6] configure / meson: Move check for pty.h to meson.build
From: |
Thomas Huth |
Subject: |
[PATCH 2/6] configure / meson: Move check for pty.h to meson.build |
Date: |
Wed, 18 Nov 2020 18:10:48 +0100 |
This check can be done in a much shorter way in meson.build
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
configure | 9 ---------
meson.build | 1 +
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/configure b/configure
index 6c8f56c514..5a5e486373 100755
--- a/configure
+++ b/configure
@@ -2319,12 +2319,6 @@ else
l2tpv3=no
fi
-if check_include "pty.h" ; then
- pty_h=yes
-else
- pty_h=no
-fi
-
cat > $TMPC <<EOF
#include <sys/mman.h>
int main(int argc, char *argv[]) {
@@ -6667,9 +6661,6 @@ if test "$sheepdog" = "yes" ; then
add_to deprecated_features "sheepdog"
echo "CONFIG_SHEEPDOG=y" >> $config_host_mak
fi
-if test "$pty_h" = "yes" ; then
- echo "HAVE_PTY_H=y" >> $config_host_mak
-fi
if test "$have_mlockall" = "yes" ; then
echo "HAVE_MLOCKALL=y" >> $config_host_mak
fi
diff --git a/meson.build b/meson.build
index 7ddf983ff7..97a6445249 100644
--- a/meson.build
+++ b/meson.build
@@ -808,6 +808,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_PTY_H', cc.has_header('pty.h'))
config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h'))
ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target
--
2.18.4
- [PATCH 0/6] configure / meson: Move check for headers to meson.build, Thomas Huth, 2020/11/18
- [PATCH 1/6] configure: Remove the obsolete check for ifaddrs.h, Thomas Huth, 2020/11/18
- [PATCH 3/6] configure / meson: Move check for drm.h to meson.build, Thomas Huth, 2020/11/18
- [PATCH 2/6] configure / meson: Move check for pty.h to meson.build,
Thomas Huth <=
- [PATCH 4/6] configure / meson: Move check for sys/signal.h to meson.build, Thomas Huth, 2020/11/18
- [PATCH 6/6] configure / meson: Move check for linux/btrfs.h to meson.build, Thomas Huth, 2020/11/18
- [PATCH 5/6] configure / meson: Move check for sys/signal.h to meson.build, Thomas Huth, 2020/11/18