From nobody Sun Feb 8 12:58:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; 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 207.211.31.81 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=1594893778; cv=none; d=zohomail.com; s=zohoarc; b=j5KE5KSTM8cHz4N/4c7ICkldyfUcFQAkXexrzHyHCqKoxFdVsClac7jAHvd8GAdtUWV8i4GimzZUryxyze3Jpk4s+/059hyVICqTvnt+cI11u+VXNnfnzbdWVmWhV8Gguq2Ju32p+qktYdFwpsu4a80SumQw87x/eE7Okq1Ky84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893778; 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=nrO/zxOqT2othhpOUpBSKn/B+HrfUpj9Y/A3GhhNU00=; b=dISocitwZYRs6wqjcch8t3nG+YgT5/7eoX7D3B5kDyqpMOrCemR8QC0N28AuqoMmg8K/AR0jZJwTUYR0TGy7Jr7X1XOtgj0IRHNWMKavov7arn/Qglpv3/B+VHPLDhGs3lT0Tv74bbr2kAArvkz/OVulBtuo/0s5E6HdQMxBsn0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594893778600407.7209957736595; Thu, 16 Jul 2020 03:02:58 -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-119-ME56UilcM-ip39jdjyfz6A-1; Thu, 16 Jul 2020 06:02:53 -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 72B1C891224; Thu, 16 Jul 2020 10:02:24 +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 4E01D61982; Thu, 16 Jul 2020 10:02:24 +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 1D99F96232; Thu, 16 Jul 2020 10:02:24 +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 06GA1pxu016063 for ; Thu, 16 Jul 2020 06:01:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id AA1162B6DB; Thu, 16 Jul 2020 10:01:51 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 217C32E040 for ; Thu, 16 Jul 2020 10:01:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893777; 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=nrO/zxOqT2othhpOUpBSKn/B+HrfUpj9Y/A3GhhNU00=; b=FJrHuhOMA9zhfwYZXpVCtRgncSTsfcx2r20qhHdtjPrRowiWXT0DGaeHuLVIAOhm20G/bZ frDmZNxE9mS6q6vWyfubbYpb/YISx+BEJxv6UUKVg8Q+av+oi+P+OCngH0agaqjXMY+/ru sf3WjGz8Nf+Ix0YMl9cvmLuYo4kU8RQ= X-MC-Unique: ME56UilcM-ip39jdjyfz6A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 049/351] meson: add glusterfs build dependency Date: Thu, 16 Jul 2020 11:54:45 +0200 Message-Id: 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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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-gluster.m4 | 32 -------------------------------- meson.build | 4 ++++ meson_options.txt | 1 + 4 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 m4/virt-gluster.m4 diff --git a/configure.ac b/configure.ac index 0a8a0221206..fa9fecccc73 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_GLUSTER LIBVIRT_ARG_HAL LIBVIRT_ARG_LIBISCSI LIBVIRT_ARG_LIBPCAP @@ -134,7 +133,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_GNUTLS LIBVIRT_CHECK_HAL LIBVIRT_CHECK_LIBISCSI @@ -448,7 +446,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_GNUTLS LIBVIRT_RESULT_HAL LIBVIRT_RESULT_LIBISCSI diff --git a/m4/virt-gluster.m4 b/m4/virt-gluster.m4 deleted file mode 100644 index 7edff40047f..00000000000 --- a/m4/virt-gluster.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl The gluster libgfapi.so library -dnl -dnl Copyright (C) 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 - -dnl Currently tested against Fedora 19 with glusterfs 3.4.1; earlier -dnl versions may be possible but only with further testing -AC_DEFUN([LIBVIRT_ARG_GLUSTER],[ - LIBVIRT_ARG_WITH_FEATURE([GLUSTERFS], [glusterfs], [check], [3.4.1]) -]) - -AC_DEFUN([LIBVIRT_CHECK_GLUSTER],[ - LIBVIRT_CHECK_PKG([GLUSTERFS], [glusterfs-api], [3.4.1]) -]) - -AC_DEFUN([LIBVIRT_RESULT_GLUSTER],[ - LIBVIRT_RESULT_LIB([GLUSTERFS]) -]) diff --git a/meson.build b/meson.build index 132d887be2a..4ee7031b32c 100644 --- a/meson.build +++ b/meson.build @@ -1047,6 +1047,9 @@ glib_dep =3D declare_dependency( dependencies: [ glib_dep, gobject_dep, gio_dep ], ) =20 +glusterfs_version =3D '3.4.1' +glusterfs_dep =3D dependency('glusterfs-api', version: '>=3D' + glusterfs_= version, required: get_option('glusterfs')) + # 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) @@ -1184,6 +1187,7 @@ libs_summary =3D { 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), 'fuse': fuse_dep.found(), 'glib_dep': glib_dep.found(), + 'glusterfs': glusterfs_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 9aae950b8ca..cc3e5bbabab 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -21,4 +21,5 @@ option('dbus', type: 'feature', value: 'auto', descriptio= n: 'dbus-1 support') option('firewalld', type: 'feature', value: 'auto', description: 'firewall= d support') option('firewalld_zone', type: 'feature', value: 'auto', description: 'whe= ther to install firewalld libvirt zone') option('fuse', type: 'feature', value: 'auto', description: 'fuse support') +option('glusterfs', type: 'feature', value: 'auto', description: 'glusterf= s support') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2