From nobody Sun Feb 8 07:14:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1594893975; cv=none; d=zohomail.com; s=zohoarc; b=gwHfuZcN7bKS9TW1cnnHkZxci4uS/W5DWd6QP24DYBBWAzRo/0fK3FYfc66/91jV0aARSQT+HOY3szePi8uDD2aHOdcsU6repA7YkO614eQPtmrNUR/DQoVtSp7Z40nZ34tSuaEcT/3ceWOwTlUW8WsSKf0stDGlOjoGmtmIE4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893975; 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=vW4JqmVfEPgYi04Ic5CLK1lT05Q9VfsYfI9gIcDuqK8=; b=hHvG5VIsG0y9FSrQpIZm1U5yTdt9utS3CO3ElgtjWdXlDG+h7c6Vam6uZHndeco+5ntiMMlojZE0/lbJWHFjDxq0zL39O2e/FyZPktKvsjA2hS8JV2kRxmm6UPP5lPIDM7q2cfkAggzLZml5yypgjLy/wf3+iDiT0IXPg+yyJac= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893975333178.01808430966332; Thu, 16 Jul 2020 03:06:15 -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-475-g5moZaUPPhaSYp2olL0imQ-1; Thu, 16 Jul 2020 06:02:53 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3E463194092C; Thu, 16 Jul 2020 10:02:17 +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 1D5F378A55; Thu, 16 Jul 2020 10:02:17 +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 DFC2C1809554; Thu, 16 Jul 2020 10:02:16 +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 06GA2E0F016248 for ; Thu, 16 Jul 2020 06:02:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6A8792B6DB; Thu, 16 Jul 2020 10:02:14 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D4FE32DE6D for ; Thu, 16 Jul 2020 10:02:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893974; 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=vW4JqmVfEPgYi04Ic5CLK1lT05Q9VfsYfI9gIcDuqK8=; b=ItfAzXZruQ6K84OXJMjmAmyb9AbwpvI1aiL1COOR80xT2kcZIdqShnsVZB9lvP7B4wt4HO 0+bY6vBrV5JT0YOlLyUa9WxlsP22n/FeTNRp0t40PIh506ZxVZiEz0BthxfXnt6AIuvBl1 bx6K50OGsze6WCK2ToMYlwAwl4zEHoE= X-MC-Unique: g5moZaUPPhaSYp2olL0imQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 060/351] meson: add libxml build dependency Date: Thu, 16 Jul 2020 11:54:56 +0200 Message-Id: <977cbd76373733b03e1a7e93f79cdcef64e883f8.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.14 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-libxml.m4 | 36 ------------------------------------ meson.build | 4 ++++ 3 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 m4/virt-libxml.m4 diff --git a/configure.ac b/configure.ac index c81db75ae33..6710900fa35 100644 --- a/configure.ac +++ b/configure.ac @@ -108,7 +108,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_LIBXML LIBVIRT_ARG_NETCF LIBVIRT_ARG_NLS LIBVIRT_ARG_NSS @@ -125,7 +124,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_LIBXML LIBVIRT_CHECK_NETCF LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NUMACTL @@ -423,7 +421,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_LIBXL -LIBVIRT_RESULT_LIBXML LIBVIRT_RESULT_NETCF LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS diff --git a/m4/virt-libxml.m4 b/m4/virt-libxml.m4 deleted file mode 100644 index cce54d88fb1..00000000000 --- a/m4/virt-libxml.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl The libxml-2.0 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_ARG_LIBXML], [ - LIBVIRT_ARG_WITH([LIBXML], [libxml-2.0 location], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_LIBXML], [ - LIBXML_REQUIRED=3D"2.9.1" - - LIBVIRT_CHECK_PKG([LIBXML], [libxml-2.0], [$LIBXML_REQUIRED]) - - if test "$with_libxml" =3D "no" ; then - AC_MSG_ERROR([libxml2 >=3D $LIBXML_REQUIRED is required for libvirt]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_LIBXML], [ - LIBVIRT_RESULT_LIB([LIBXML]) -]) diff --git a/meson.build b/meson.build index 6f37862611a..55cf12a951c 100644 --- a/meson.build +++ b/meson.build @@ -1142,6 +1142,9 @@ else libssh2_dep =3D dependency('', required: false) endif =20 +libxml_version =3D '2.9.1' +libxml_dep =3D dependency('libxml-2.0', version: '>=3D' + libxml_version) + use_macvtap =3D false if not get_option('macvtap').disabled() if (cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_BRIDGE') and @@ -1310,6 +1313,7 @@ libs_summary =3D { 'libpcap': libpcap_dep.found(), 'libssh': libssh_dep.found(), 'libssh2': libssh2_dep.found(), + 'libxml': libxml_dep.found(), 'macvtap': conf.has('WITH_MACVTAP'), 'readline': readline_dep.found(), } --=20 2.26.2