From patchwork Mon Dec 14 15:57:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1416060 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CvmPp6gv6z9sS8 for ; Tue, 15 Dec 2020 03:02:54 +1100 (AEDT) Received: from localhost ([::1]:48684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1koqJI-00041m-Sb for incoming@patchwork.ozlabs.org; Mon, 14 Dec 2020 11:02:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koqEc-0007vg-Bh; Mon, 14 Dec 2020 10:58:02 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:43647) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koqEV-0001RE-68; Mon, 14 Dec 2020 10:58:02 -0500 Received: from localhost.localdomain ([82.252.135.218]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MkHIV-1kQFuO2XXt-00kgdi; Mon, 14 Dec 2020 16:57:49 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 15/19] configure / meson: Move check for pty.h to meson.build Date: Mon, 14 Dec 2020 16:57:29 +0100 Message-Id: <20201214155733.207430-16-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201214155733.207430-1-laurent@vivier.eu> References: <20201214155733.207430-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:z7y1afgEAePsEXgHdGk4OgPZ/fUlYM1E1J6zgKXB7HE0RpjQb6z UdGMV2EHLvbuN4DZjpYbF62K7XDRucJMewH0AkKuno4DmfaaWbQa7H9JO6DyukxsjX8mO9d +EGCTanChivGOM+XLBGJWf95g7OzQ+SZGopXxykffxKCt1lWxEnmhK7WF51+GX7pMhdyqKd KCuUYXs426JHLBJCtld5w== X-UI-Out-Filterresults: notjunk:1;V03:K0:gKf0OaDty2A=:mwFre4kswu0Dkl7ZS1wL+g WtWTlnIb4SHusORQfISvl9COCLicd7iY3fu2NuHw9y3CQHEaUgzbuOMplsaEl+cQlpfoyyUNC qiHQBFWKmvbDcsf3HbmAccNuWxYA77rZSgO9eNjjr9Epyqfljp7wZbm0qQhtfVQ40TgrG7G+Y KhBN4xHTecUR5RicniS6QPiNrURjXZ/gSRLgIb/SxDiznnRzvbCdZfZMO8aE6uvOAPTEUgZNI kEwD9aw1Brw9zw3Jv62r0skjTQlo69DNYq7Sh+aeAfu97Xn4wPxw9rcX+HjaSh3oIo3KNWnB5 2m/QFI+AYtntJDenXgSC40+JgGXEWLKBpV4Y9VZ8LNMcPsXAiApctGil16uqyV1NShxSHdkC3 n/eL8n6dvbv+84ao6ANiPJGniuX+0jxHnv/BNdqrw4+DbP2uOG87ZbTPnCBegB3L+c/rgudbT l4lPJ8yhVA== Received-SPF: none client-ip=217.72.192.73; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , qemu-trivial@nongnu.org, Michael Tokarev , Richard Henderson , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth This check can be done in a much shorter way in meson.build Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20201118171052.308191-3-thuth@redhat.com> Signed-off-by: Laurent Vivier --- configure | 9 --------- meson.build | 1 + 2 files changed, 1 insertion(+), 9 deletions(-) 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 < 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