qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>
Cc: Laurent Vivier <laurent@vivier.eu>
Subject: [PATCH 2/6] configure / meson: Move check for pty.h to meson.build
Date: Wed, 18 Nov 2020 18:10:48 +0100	[thread overview]
Message-ID: <20201118171052.308191-3-thuth@redhat.com> (raw)
In-Reply-To: <20201118171052.308191-1-thuth@redhat.com>

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



  parent reply	other threads:[~2020-11-18 17:25 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-18 17:10 [PATCH 0/6] configure / meson: Move check for headers to meson.build Thomas Huth
2020-11-18 17:10 ` [PATCH 1/6] configure: Remove the obsolete check for ifaddrs.h Thomas Huth
2020-11-20  0:06   ` Richard Henderson
2020-12-13 17:56   ` Laurent Vivier
2020-11-18 17:10 ` Thomas Huth [this message]
2020-11-18 18:15   ` [PATCH 2/6] configure / meson: Move check for pty.h to meson.build Philippe Mathieu-Daudé
2020-11-20  0:09   ` Richard Henderson
2020-12-13 17:57   ` Laurent Vivier
2020-11-18 17:10 ` [PATCH 3/6] configure / meson: Move check for drm.h " Thomas Huth
2020-11-18 18:15   ` Philippe Mathieu-Daudé
2020-11-20  0:09   ` Richard Henderson
2020-12-13 17:58   ` Laurent Vivier
2020-11-18 17:10 ` [PATCH 4/6] configure / meson: Move check for sys/signal.h " Thomas Huth
2020-11-18 18:16   ` Philippe Mathieu-Daudé
2020-11-20  0:10   ` Richard Henderson
2020-12-13 17:59   ` Laurent Vivier
2020-11-18 17:10 ` [PATCH 5/6] " Thomas Huth
2020-11-18 17:27   ` Eric Blake
2020-11-18 18:19     ` Philippe Mathieu-Daudé
2020-11-20  0:11   ` Richard Henderson
2020-12-13 18:01   ` Laurent Vivier
2020-11-18 17:10 ` [PATCH 6/6] configure / meson: Move check for linux/btrfs.h " Thomas Huth
2020-11-18 18:18   ` Philippe Mathieu-Daudé
2020-11-20  0:12   ` Richard Henderson
2020-12-13 18:02   ` Laurent Vivier
2020-11-18 17:20 ` [PATCH 0/6] configure / meson: Move check for headers " Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201118171052.308191-3-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=laurent@vivier.eu \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).