From nobody Sun Feb 8 14:47:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1555000517; cv=none; d=zoho.com; s=zohoarc; b=dGIlhjKVL817BvMsZrvUKd6OznRm7Afkr5QkGPUwIFGwgSjATy2wtcXKDDqavu1tCl4rExUh/78PGk/0FbFD28iQ5lp5FqnjcBJoBw8Kxj4dQzxWH1R9OxcD7wA8NBFvEjo3IexncZyHZiY2Th8BONI7xdchh1qc8zYMx+mVHK4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555000517; 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:ARC-Authentication-Results; bh=lhpUDu2Fhhl34Hs0pyj7kkwwgmse5kuglrewHaPZ/F4=; b=Z7kAZRashZmQQnn6yUPLkUHT4K7tfw/lUKTgVm+95w2BfV/W9mCmnhIQGf3P4ELTuvJKLZyrPLGv1k2QfJWoziwqrXjidBTjiBoKtpgLBLcmdonY8kz6JwWvUG7OV+ABCs/ZOebPMGIXEeIGdgSG4DXPPM6ky5X6NJeSSs0z798= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1555000517154969.1419208982783; Thu, 11 Apr 2019 09:35:17 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 25312300358C; Thu, 11 Apr 2019 16:35:15 +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 EA4E35D9C8; Thu, 11 Apr 2019 16:35:14 +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 9E375181AC46; Thu, 11 Apr 2019 16:35:14 +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 x3BGZC6B030104 for ; Thu, 11 Apr 2019 12:35:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7487B19C65; Thu, 11 Apr 2019 16:35:12 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F05A019C58 for ; Thu, 11 Apr 2019 16:35:11 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 11 Apr 2019 18:35:03 +0200 Message-Id: <20190411163504.13451-2-abologna@redhat.com> In-Reply-To: <20190411163504.13451-1-abologna@redhat.com> References: <20190411163504.13451-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] src: Include SASL_CFLAGS where appropriate 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: , Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 11 Apr 2019 16:35:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" A bunch of files include src/rpc/virnetsaslcontext.h, which in turn includes , and without the corresponding CFLAGS the compiler can't locate the latter if it happens to be installed outside of the default include path as is the case, for example, on FreeBSD. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/admin/Makefile.inc.am | 6 ++++++ src/locking/Makefile.inc.am | 12 ++++++++++++ src/logging/Makefile.inc.am | 6 ++++++ src/remote/Makefile.inc.am | 6 ++++++ src/rpc/Makefile.inc.am | 6 ++++++ 5 files changed, 36 insertions(+) diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 55d721f0bf..19afb0e179 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -32,6 +32,12 @@ libvirt_driver_admin_la_CFLAGS =3D \ libvirt_driver_admin_la_LIBADD =3D ../gnulib/lib/libgnu.la libvirt_driver_admin_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) =20 +if WITH_SASL +libvirt_driver_admin_la_CFLAGS +=3D \ + $(SASL_CFLAGS) \ + $(NULL) +endif WITH_SASL + # admin/admin_remote.c is being included in libvirt-admin.c, so we # need to include it in the dist EXTRA_DIST +=3D admin/admin_remote.c diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 6de7f7bab8..5d5e923769 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -105,6 +105,12 @@ if WITH_DTRACE_PROBES lockd_la_LIBADD +=3D libvirt_probes.lo endif WITH_DTRACE_PROBES =20 +if WITH_SASL +lockd_la_CFLAGS +=3D \ + $(SASL_CFLAGS) \ + $(NULL) +endif WITH_SASL + if WITH_QEMU augeastest_DATA +=3D test_libvirt_lockd.aug CLEANFILES +=3D test_libvirt_lockd.aug @@ -148,6 +154,12 @@ if WITH_DTRACE_PROBES virtlockd_LDADD +=3D libvirt_probes.lo endif WITH_DTRACE_PROBES =20 +if WITH_SASL +virtlockd_CFLAGS +=3D \ + $(SASL_CFLAGS) \ + $(NULL) +endif WITH_SASL + if WITH_SANLOCK lockdriver_LTLIBRARIES +=3D sanlock.la sanlock_la_SOURCES =3D $(LOCK_DRIVER_SANLOCK_SOURCES) diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index a4739b2d44..3f4a87d91a 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -88,6 +88,12 @@ if WITH_DTRACE_PROBES virtlogd_LDADD +=3D libvirt_probes.lo endif WITH_DTRACE_PROBES =20 +if WITH_SASL +virtlogd_CFLAGS +=3D \ + $(SASL_CFLAGS) \ + $(NULL) +endif WITH_SASL + conf_DATA +=3D logging/virtlogd.conf =20 augeas_DATA +=3D logging/virtlogd.aug diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index dccecf8cd3..13a1f9f8f2 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -99,6 +99,12 @@ libvirt_driver_remote_la_CFLAGS =3D \ libvirt_driver_remote_la_LDFLAGS =3D $(AM_LDFLAGS) libvirt_driver_remote_la_SOURCES =3D $(REMOTE_DRIVER_SOURCES) =20 +if WITH_SASL +libvirt_driver_remote_la_CFLAGS +=3D \ + $(SASL_CFLAGS) \ + $(NULL) +endif WITH_SASL + endif WITH_REMOTE =20 if WITH_REMOTE diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am index b8c80528d2..722ef64db1 100644 --- a/src/rpc/Makefile.inc.am +++ b/src/rpc/Makefile.inc.am @@ -135,3 +135,9 @@ libvirt_net_rpc_client_la_CFLAGS =3D \ $(NULL) libvirt_net_rpc_client_la_LDFLAGS =3D $(AM_LDFLAGS) libvirt_net_rpc_client_la_LIBADD =3D $(CYGWIN_EXTRA_LIBADD) + +if WITH_SASL +libvirt_net_rpc_client_la_CFLAGS +=3D \ + $(SASL_CFLAGS) \ + $(NULL) +endif WITH_SASL --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun Feb 8 14:47:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1555000524; cv=none; d=zoho.com; s=zohoarc; b=D0SwYPDObvBcNnORsGAy2dxRZbaSCCZxDsHYOfXdo1ADRU0TiMcHss3GH7V/7v99fImVPkBbdJfeVn7tbPRCCWObYAmgFsZQCIf+RObxTm52G0VEWXnsk75WGEBHhAZLl1b5D/C3A9AwN4yvShqx+YWd11ysc9kkg/WwsXkGMpo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555000524; 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:ARC-Authentication-Results; bh=Z7TGk2ll9YEEdxuO2qV9VRPVlTJaSW04hTIESWrpDk4=; b=H5vS9T2OhptPJUVwm0V4MgptbdFis7ljQ7SpkkBQ8xH1FN5nkSmWGEOQrSGORHjRk+HPcWtwKMakQOY1UDd5VqRQPODsynu9AQ0mCBXC7+VVMkK3FHLKaE6JhUNHHmmX8Ew1GRxIIH30yd1IFE3kTp15Gicz+kLkbdIGscJ+nQ8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 155500052418512.484349455710685; Thu, 11 Apr 2019 09:35:24 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DD42F30ABABA; Thu, 11 Apr 2019 16:35:21 +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 B3E705C219; Thu, 11 Apr 2019 16:35:21 +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 64555181AC8F; Thu, 11 Apr 2019 16:35:21 +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 x3BGZDAg030113 for ; Thu, 11 Apr 2019 12:35:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4793119C65; Thu, 11 Apr 2019 16:35:13 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C315319C58 for ; Thu, 11 Apr 2019 16:35:12 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 11 Apr 2019 18:35:04 +0200 Message-Id: <20190411163504.13451-3-abologna@redhat.com> In-Reply-To: <20190411163504.13451-1-abologna@redhat.com> References: <20190411163504.13451-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] m4: sasl: Use pkg-config 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 11 Apr 2019 16:35:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Since commit 4e75b0a00fb4 we support SASL 2.1.26 and newer releases only, all of which ship a .pc file. Using pkg-config allows FreeBSD builds to pick up the dependency automatically. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- m4/virt-sasl.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-sasl.m4 b/m4/virt-sasl.m4 index 7ab9b2c368..674e169350 100644 --- a/m4/virt-sasl.m4 +++ b/m4/virt-sasl.m4 @@ -22,7 +22,7 @@ AC_DEFUN([LIBVIRT_ARG_SASL],[ ]) =20 AC_DEFUN([LIBVIRT_CHECK_SASL],[ - LIBVIRT_CHECK_LIB([SASL], [sasl2], [sasl_client_init], [sasl/sasl.h]) + LIBVIRT_CHECK_PKG([SASL], [libsasl2], [2.1.26]) ]) =20 AC_DEFUN([LIBVIRT_RESULT_SASL],[ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list