From nobody Mon Feb 9 05:41:17 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=1594893840; cv=none; d=zohomail.com; s=zohoarc; b=ajvZrYisSSLqhOJCZ6o6RhaDTYCqvWPaIl7MGcr+OETyL0sR/VTA92diNm5q1VppyNAO6lia4H9MWVsR+uJdthE4lFwTJZO6J9WTqDqI3PycRynW5ldlcEEfINijT1BvKg4susSY6Kz5LLhmSAdPvDsQdf5XnwEiclF3e11h838= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893840; 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=fDtOQ4+Zotn5RWeFy87C2WcyqwilfCqvQBzc0uGW2y0=; b=j8SJIKjRu/iBKPwSInXoJsu/4Jr2bWVv7R73ixTetYecHwPB9itRGe5sxvwwTobM3UbafXISi/VinRQYQUHTbZGuzay7fyt4IjdbvKYcU67ahb+3KPrTotEckOhXpnywmrrKD51Iem2rinUnzgnpji3fmKqKIp24ppUIG6u7HtY= 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 159489384077399.96639204328505; Thu, 16 Jul 2020 03:04:00 -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-401-sWdEo2b8NRaSbxXH7yd8uQ-1; Thu, 16 Jul 2020 06:02:32 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D9D6100CCD8; Thu, 16 Jul 2020 10:02:20 +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 2901A60C47; Thu, 16 Jul 2020 10:02:20 +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 E72CC1806B0A; Thu, 16 Jul 2020 10:02:19 +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 06GA2J51016298 for ; Thu, 16 Jul 2020 06:02:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 34EFA2B6DB; Thu, 16 Jul 2020 10:02:19 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1F2A2E025 for ; Thu, 16 Jul 2020 10:02:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893839; 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=fDtOQ4+Zotn5RWeFy87C2WcyqwilfCqvQBzc0uGW2y0=; b=fyEOQiGgM5jLr89pk8J33BhkWvPB6vMpstrhm9jPkwPJW3nZDcURQnz03S9nFyb8BxwgQS G/guyM8ZjDUqf99ZCJwMV31w3TMpRXTduNp4xa3AW8Crovt2p+JZR1IU5iDemRy3XEZ1tg XmHJgZHqSxybRw8D0ZQLOI4HRaYrzYU= X-MC-Unique: sWdEo2b8NRaSbxXH7yd8uQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 061/351] meson: add netcf build options Date: Thu, 16 Jul 2020 11:54:57 +0200 Message-Id: <87577b7b6ec0200131aecff23846af60a0c765ea.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.12 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 | 3 --- m4/virt-netcf.m4 | 30 ------------------------------ meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-netcf.m4 diff --git a/configure.ac b/configure.ac index 6710900fa35..798a30bbd3d 100644 --- a/configure.ac +++ b/configure.ac @@ -108,7 +108,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_NETCF LIBVIRT_ARG_NLS LIBVIRT_ARG_NSS LIBVIRT_ARG_NUMACTL @@ -124,7 +123,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_NETCF LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER @@ -421,7 +419,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_LIBXL -LIBVIRT_RESULT_NETCF LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL diff --git a/m4/virt-netcf.m4 b/m4/virt-netcf.m4 deleted file mode 100644 index ada6b5a7a98..00000000000 --- a/m4/virt-netcf.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libnetcf.so library -dnl -dnl Copyright (C) 2012-2013 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_ARG_NETCF],[ - LIBVIRT_ARG_WITH_FEATURE([NETCF], [netcf], [check], [0.1.8]) -]) - -AC_DEFUN([LIBVIRT_CHECK_NETCF],[ - LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.8]) -]) - -AC_DEFUN([LIBVIRT_RESULT_NETCF],[ - LIBVIRT_RESULT_LIB([NETCF]) -]) diff --git a/meson.build b/meson.build index 55cf12a951c..025878a0df6 100644 --- a/meson.build +++ b/meson.build @@ -1164,6 +1164,12 @@ if use_macvtap endif endif =20 +netcf_version =3D '0.1.8' +netcf_dep =3D dependency('netcf', version: '>=3D' + netcf_version, require= d: get_option('netcf')) +if netcf_dep.found() + conf.set('WITH_NETCF', 1) +endif + # 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) @@ -1315,6 +1321,7 @@ libs_summary =3D { 'libssh2': libssh2_dep.found(), 'libxml': libxml_dep.found(), 'macvtap': conf.has('WITH_MACVTAP'), + 'netcf': netcf_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index a6e53ca36dc..dc248ee0fe4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -28,4 +28,5 @@ option('libpcap', type: 'feature', value: 'auto', descrip= tion: 'libpcap support' option('libssh', type: 'feature', value: 'auto', description: 'libssh supp= ort') option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 su= pport') option('macvtap', type: 'feature', value: 'auto', description: 'enable mac= vtap device') +option('netcf', type: 'feature', value: 'auto', description: 'netcf suppor= t') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2