diff mbox series

[PULL,15/19] configure / meson: Move check for pty.h to meson.build

Message ID 20201214155733.207430-16-laurent@vivier.eu
State New
Headers show
Series [PULL,01/19] target/i386: tracing: format length values as hex | expand

Commit Message

Laurent Vivier Dec. 14, 2020, 3:57 p.m. UTC 
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-3-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 configure   | 9 ---------
 meson.build | 1 +
 2 files changed, 1 insertion(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/configure b/configure
index 1df5c848110e..39e61b275806 100755
--- a/configure
+++ b/configure
@@ -2332,12 +2332,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[]) {
@@ -6687,9 +6681,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 f344b25955f9..ef053c98376d 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_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