From nobody Wed Nov 27 00:46:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1703179352; cv=none; d=zohomail.com; s=zohoarc; b=gK2pZC9wB2pIIO3Walns8xL+78kxyTuFXqh7OTEJDLFFuR9cXG6CbQLtaBTZ6xnVWvizWY6yqwNN2l85fJkRH6823CIyPpJFnwzhJerN64HPMgczVC5nItWEwg3YbrZSQC4K0VAAWAd/E0QwY4CPzRbBbccWmUpZ4Sm+wQyQXQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1703179352; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=ZU8vC0eIKV9J0hzsPh1002ojqbIAEiiqGuIlBmmkI1A=; b=HZ5iNJ4m3imH344rF6S5Y2EjiVVD4pZgUdhgO2l5lH9AixretdrzgWKggsFawERxVTfiff2/pVZ2EEJURFaS0dYjedcEzdaslqJe2HAL5bjZSlAPm2Vg/PzeHKwqcQ+3viMm/RM2IOUzIxjRfSEdDzQUiMzIdKtou0ORnk6e7o4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1703179352782918.8173572221789; Thu, 21 Dec 2023 09:22:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMic-0007ZD-39; Thu, 21 Dec 2023 12:20:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMia-0007YL-99 for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMiY-0004UO-R2 for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:19 -0500 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-124-EwY2ohpDMWOM_1bostTNjA-1; Thu, 21 Dec 2023 12:20:16 -0500 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-33349915d3cso678990f8f.3 for ; Thu, 21 Dec 2023 09:20:16 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id y17-20020adff151000000b0033664ffaf5dsm2483766wro.37.2023.12.21.09.20.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZU8vC0eIKV9J0hzsPh1002ojqbIAEiiqGuIlBmmkI1A=; b=e9afBHTuQoxKQtB/SwzSJ+8Jnv8r2xcNEkS8NyKQBxdMk+ZrHYG+Tnnzd6K9JWnZ7Dl5q6 5xR9xhknnIcP2PmMK6QpdQ+k6zDOrwGpxOOf7oPOQJkYWr2NIrendIY9WygsDK8pyNROB4 PwUxC4ueXMnDu7jTwZa5duJja5zwccU= X-MC-Unique: EwY2ohpDMWOM_1bostTNjA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179215; x=1703784015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZU8vC0eIKV9J0hzsPh1002ojqbIAEiiqGuIlBmmkI1A=; b=Rnjg4tzUim4LKJf42FJzpNDcVJKGPVdWFTrXE/XStKDr2v5mDI1vmS9QoDrL/tBMKl 87cZpw+PvIY2Giq9jtY8K4w7p+jvrphpJf+HQ0KgZPLtvcha9NSwh43koS+QkZPfHMY0 /FX/Mjlls6YLvCqQkPzAdDeL9H14aCFqP+kTI4H+SBSEw2PvDGKAwVEXIZ0wIfcIL6xY ly3n9lNnjJa2kENPQkLJpI/hEmFKNq7wB3oJVXKMWG2Tp2qxwrrtSlG/RLfO7+SECXN2 EY3GyEnGbe9N4peQuYS4NluYQKMPPmEYBjkAB4P78dnkEqpZpQ1N0b18z8/KkrO3dU6W fG6w== X-Gm-Message-State: AOJu0YwjIlUWi58gYObx/RRWHpfd6EVQq7VSQVBmBvptiO5dWmkDcbLw 2LmpIq4RAFydeFnNXgMIrtEwaBcVngjZK4G9pBixy0XC8d+r+P1h2R7tTDlD+kaQ/b6pjpQRRg6 AHdOERWWyh+fhtvAC/U0pYTPvPNBWgccngKS1xphkVWMQy/pvl5CSE7j9GVEIkdEpojFPRaIVep QR3oDu5GA= X-Received: by 2002:a5d:6052:0:b0:336:7a45:c134 with SMTP id j18-20020a5d6052000000b003367a45c134mr49498wrt.86.1703179214826; Thu, 21 Dec 2023 09:20:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IEAr8sCdDSYehFmJVmwpSMyOAYE82EUdmHisRULAfklFUEwLegFKft525NXga73hw3x8WV4Qg== X-Received: by 2002:a5d:6052:0:b0:336:7a45:c134 with SMTP id j18-20020a5d6052000000b003367a45c134mr49494wrt.86.1703179214575; Thu, 21 Dec 2023 09:20:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 07/21] meson: always probe u2f and canokey if the option is enabled Date: Thu, 21 Dec 2023 18:19:44 +0100 Message-ID: <20231221171958.59350-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1703179353877100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 6c77d9687de..de33e323d43 100644 --- a/meson.build +++ b/meson.build @@ -1759,12 +1759,12 @@ if not get_option('smartcard').auto() or have_system version: '>=3D2.5.1', method: 'pkg-config') endif u2f =3D not_found -if have_system +if not get_option('u2f').auto() or have_system u2f =3D dependency('u2f-emu', required: get_option('u2f'), method: 'pkg-config') endif canokey =3D not_found -if have_system +if not get_option('canokey').auto() or have_system canokey =3D dependency('canokey-qemu', required: get_option('canokey'), method: 'pkg-config') endif --=20 2.43.0