From nobody Sun Feb 8 05:47:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594893751; cv=none; d=zohomail.com; s=zohoarc; b=f1gRlfCvVfq6S3V84wuCag54O/Wr83Lj+k1IlfV8TPAmnTt0dd1NCkgow+SEyEjo6QKTGmw7W/QQpdq/g+Yzsk5Sf613yraPzy79U8Kduq62KCgAzDRjq4MgStggVmf75Y9/yR+u0RDITZPp4sBCVgC8CLG60+FPzv1zbEC/GB4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893751; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TsbMW8vwuXhCSjulibdP0QuUHXd3mlSmkFG+qk8xJDM=; b=eOfOKBXyInJXHay0eZBBKlpeLQ45FadzKoEGU8XhcvwRApSWFjbwXnhGCDfjtR3F36bcqh0AR4FleyiMjxI7MXi0zjplWIrBLhs3pTTeXjom1OYSiM+5PMip44a+7Yc21qFBoLnSPLWdGGy+fdZbQNfrli70jNXiwJXnoxrlysI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1594893751009431.6273064780362; Thu, 16 Jul 2020 03:02:31 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-455-0FspXCThPiKWIYUMnEHkvw-1; Thu, 16 Jul 2020 06:02:27 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 32F83ED83; Thu, 16 Jul 2020 10:02:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8D914872F3; Thu, 16 Jul 2020 10:02:00 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 56AC31809554; Thu, 16 Jul 2020 10:02:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA1x4l016088 for ; Thu, 16 Jul 2020 06:01:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 05C482E05A; Thu, 16 Jul 2020 10:01:59 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52ABE2E046 for ; Thu, 16 Jul 2020 10:01:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893749; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=TsbMW8vwuXhCSjulibdP0QuUHXd3mlSmkFG+qk8xJDM=; b=bCYqVav2oisNXfCAi5nUftxA41ADFPiXPeC13pIMIePfPCcEe7rGVBjWXInRGhHSj/RDD6 7IbkTPJXl5fwnw2/x2cmbstVqCCFKWpVew5W/arjoWf1JL59ZKAYZKkQ1T/zCIfH2BKqQe sV3cN8InkenjpoDmYn8jyM0oD3QCE3I= X-MC-Unique: 0FspXCThPiKWIYUMnEHkvw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 050/351] meson: add GnuTLS build dependency Date: Thu, 16 Jul 2020 11:54:46 +0200 Message-Id: <8264e110f45ac083bbb7a483e2ad75e6e0faaf82.1594891445.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- configure.ac | 2 -- m4/virt-gnutls.m4 | 30 ------------------------------ meson.build | 4 ++++ 3 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 m4/virt-gnutls.m4 diff --git a/configure.ac b/configure.ac index fa9fecccc73..de31d11e63b 100644 --- a/configure.ac +++ b/configure.ac @@ -133,7 +133,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_GNUTLS LIBVIRT_CHECK_HAL LIBVIRT_CHECK_LIBISCSI LIBVIRT_CHECK_LIBNL @@ -446,7 +445,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_GNUTLS LIBVIRT_RESULT_HAL LIBVIRT_RESULT_LIBISCSI LIBVIRT_RESULT_LIBNL diff --git a/m4/virt-gnutls.m4 b/m4/virt-gnutls.m4 deleted file mode 100644 index 6829ca55cf5..00000000000 --- a/m4/virt-gnutls.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The gnutls libgnutls.so library -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[ - LIBVIRT_CHECK_PKG([GNUTLS], [gnutls], [3.2.0]) - - dnl Require gnutls >=3D 3.2.0 because of 3.2.11 in Ubuntu 14.04 - dnl That should have all the functions we use (in >=3D 2.12) - dnl and also use nettle, because it's >=3D 3.0 -]) - -AC_DEFUN([LIBVIRT_RESULT_GNUTLS],[ - LIBVIRT_RESULT_LIB([GNUTLS]) -]) diff --git a/meson.build b/meson.build index 4ee7031b32c..5a9e9f26db1 100644 --- a/meson.build +++ b/meson.build @@ -1050,6 +1050,9 @@ glib_dep =3D declare_dependency( glusterfs_version =3D '3.4.1' glusterfs_dep =3D dependency('glusterfs-api', version: '>=3D' + glusterfs_= version, required: get_option('glusterfs')) =20 +gnutls_version =3D '3.2.0' +gnutls_dep =3D dependency('gnutls', version: '>=3D' + gnutls_version) + # readline 7.0 is the first version which includes pkg-config support readline_version =3D '7.0' readline_dep =3D dependency('readline', version: '>=3D' + readline_version= , required: false) @@ -1188,6 +1191,7 @@ libs_summary =3D { 'fuse': fuse_dep.found(), 'glib_dep': glib_dep.found(), 'glusterfs': glusterfs_dep.found(), + 'gnutls': gnutls_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) --=20 2.26.2