From nobody Sun Feb 8 05:47:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1594893704; cv=none; d=zohomail.com; s=zohoarc; b=HZ//BDy0ouCG+VBqeaSmrkMaJpCXhc3rgMcnavlNzt4r5eMFfFEycLAxceveMuY/pLlemanXVAtTNur6ZBkQh1Cg6y+m8ymRtZOOlaG4wFBnWMSUYME+Hun9VL8A8K/aUwHq9QasdJ8XG/w2FgEzZ+W8yYNPWtuKRBzEEHiOpG4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893704; 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=3GCqEhKRRLc2E/R0QgMYbi7w0q8Uf1hK+8UZtrZVrI8=; b=iYuVyS+pwSnLoQynlxlxyinqNQGZk9+AoreDqc/MkR3sDjL0OBiaiGy7hYGbEDDvjG3tSZaAyCSwi/Nuzx56PoyKIHIFcd2NBxZGzGAMQZgVyquzSEuJ+T/CzkoiflxsNKf3GtjBth/h7zKGC6doj2zvyX4c1EtAgHy9YKN3Hz0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594893704496258.7059180224726; Thu, 16 Jul 2020 03:01:44 -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-402-r5GoKp2jPEa09PkIyvUwUw-1; Thu, 16 Jul 2020 06:01: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 B18A510059AA; Thu, 16 Jul 2020 10:01:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8DDB170A13; Thu, 16 Jul 2020 10:01:26 +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 5B8BD96251; Thu, 16 Jul 2020 10:01:26 +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 06GA1OCX015940 for ; Thu, 16 Jul 2020 06:01:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 900892E040; Thu, 16 Jul 2020 10:01:24 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 080BA2E03A for ; Thu, 16 Jul 2020 10:01:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893703; 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=3GCqEhKRRLc2E/R0QgMYbi7w0q8Uf1hK+8UZtrZVrI8=; b=Oa6dhdoeg2ooAiFh3NxEymyqfo2vCHvtjrLoXp0iG7yzL3mtp/fqI8zc91BMQiUNxCQSnX ri4gTaYmlYCzSO9Ef7u+n8xPVW1L+XaIvNuvYnUmvV6yqxh/o1sccNXpvTtFfio7PGQafO clyatofqmlQ3LQ/v8ehG1Yc9A7Y/ROw= X-MC-Unique: r5GoKp2jPEa09PkIyvUwUw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 048/351] meson: add GLib dependency Date: Thu, 16 Jul 2020 11:54:44 +0200 Message-Id: <844fba94deedb8bc99aeec91f685a5a040a49dde.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 | 2 -- m4/virt-glib.m4 | 36 ------------------------------------ meson.build | 9 +++++++++ 3 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 m4/virt-glib.m4 diff --git a/configure.ac b/configure.ac index b136bf6a4cd..0a8a0221206 100644 --- a/configure.ac +++ b/configure.ac @@ -134,7 +134,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_GLIB LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_GNUTLS LIBVIRT_CHECK_HAL @@ -449,7 +448,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_GLIB LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_GNUTLS LIBVIRT_RESULT_HAL diff --git a/m4/virt-glib.m4 b/m4/virt-glib.m4 deleted file mode 100644 index 03e51711c0c..00000000000 --- a/m4/virt-glib.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl The glib.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_ARG_GLIB], [ - LIBVIRT_ARG_WITH([GLIB], [glib-2.0 location], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_GLIB],[ - GLIB_REQUIRED=3D2.48.0 - - LIBVIRT_CHECK_PKG([GLIB], [glib-2.0 gobject-2.0 gio-2.0], [$GLIB_REQUIRE= D]) - - if test "$with_glib" =3D "no" ; then - AC_MSG_ERROR([glib-2.0, gobject-2.0 >=3D $GLIB_REQUIRED are required f= or libvirt]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_GLIB], [ - LIBVIRT_RESULT_LIB([GLIB]) -]) diff --git a/meson.build b/meson.build index 7ed5a0218f9..132d887be2a 100644 --- a/meson.build +++ b/meson.build @@ -1039,6 +1039,14 @@ if fuse_dep.found() conf.set('WITH_FUSE', 1) endif =20 +glib_version =3D '2.48.0' +glib_dep =3D dependency('glib-2.0', version: '>=3D' + glib_version) +gobject_dep =3D dependency('gobject-2.0', version: '>=3D' + glib_version) +gio_dep =3D dependency('gio-2.0', version: '>=3D' + glib_version) +glib_dep =3D declare_dependency( + dependencies: [ glib_dep, gobject_dep, gio_dep ], +) + # 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) @@ -1175,6 +1183,7 @@ libs_summary =3D { 'firewalld': conf.has('WITH_FIREWALLD'), 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), 'fuse': fuse_dep.found(), + 'glib_dep': glib_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) --=20 2.26.2