From nobody Tue Feb 10 03:45:35 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=1554815514; cv=none; d=zoho.com; s=zohoarc; b=Rp+uXyK25zdsvZFV60Hik5ieeJ/UPkYFYbtFAQ9BvbCuDe+PoRcZtlJJdf7qyYmo5zm4pBVcf8AYmUnc2QRpLpuc/wWlxU++f3ZOyg5BMu3XE77Ip2pnzpvd0An+vXyEikiAXh/ccviZyab58JBBypKrO1yfGKtlCJ/t4vt3cfA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554815514; 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=OMjNG+AOopNqLnRfSpWdfxq6RQOk8j1hsgbbvZnbfxk=; b=VM+SSyxO8nqdHYd609v5p8FgUhKKtXBb+ccNbDdtZJL1DwN+RgO/hShT6mQfhNSURpe60FsztanpII/+TwS3t8M8KSQu5ysHhszLkFvC8frmqgkGx2KAM9n7y56KhbWk0tWxxDzKoGdXZDzAsPsVsm8LaugMfBzmhQr/km/2wts= 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 1554815514403341.28722818751817; Tue, 9 Apr 2019 06:11:54 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 54629307D985; Tue, 9 Apr 2019 13:11:47 +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 2DD3169196; Tue, 9 Apr 2019 13:11:40 +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 02199181AC46; Tue, 9 Apr 2019 13:11:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x39DATCr005576 for ; Tue, 9 Apr 2019 09:10:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 30C6B1891B; Tue, 9 Apr 2019 13:10:29 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AE3835C28D for ; Tue, 9 Apr 2019 13:10:28 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 9 Apr 2019 15:10:19 +0200 Message-Id: <20190409131023.20275-3-abologna@redhat.com> In-Reply-To: <20190409131023.20275-1-abologna@redhat.com> References: <20190409131023.20275-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/6] m4: readline: Extract code setting -D_FUNCTION_DEF 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 09 Apr 2019 13:11:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The current code is a bit awkward, and we're going to need to share it later anyway. We can drop the call to AC_SUBST() while we're at it, since LIBVIRT_CHECK_LIB() already marks READLINE_CFLAGS for substitution. The new code goes to some extra length to avoid setting -D_FUNCTION_DEF twice: this is mostly for cosmetic reasons, and it's necessary because LIBVIRT_CHECK_READLINE() is called twice: once on its own, and then once more as part of LIBVIRT_CHECK_BASH_COMPLETION(). Signed-off-by: Andrea Bolognani --- m4/virt-readline.m4 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/m4/virt-readline.m4 b/m4/virt-readline.m4 index 34b3ff3c4a..ffaeacef75 100644 --- a/m4/virt-readline.m4 +++ b/m4/virt-readline.m4 @@ -58,10 +58,18 @@ AC_DEFUN([LIBVIRT_CHECK_READLINE],[ # function, to ensure we aren't being confused by caching. LIBS=3D$lv_saved_libs AC_CHECK_LIB([readline], [rl_initialize], - [READLINE_CFLAGS=3D"-D_FUNCTION_DEF $READLINE_CFLAGS" - AC_SUBST(READLINE_CFLAGS)], + [], [READLINE_LIBS=3D"$READLINE_LIBS $extra_LIBS"]) LIBS=3D$lv_saved_libs + + # We need this to avoid compilation issues with modern compilers. + # See 9ea3424a178 for a more detailed explanation + if test "$with_readline" =3D "yes" ; then + case "$READLINE_CFLAGS" in + *-D_FUNCTION_DEF*) ;; + *) READLINE_CFLAGS=3D"-D_FUNCTION_DEF $READLINE_CFLAGS" ;; + esac + fi ]) =20 AC_DEFUN([LIBVIRT_RESULT_READLINE],[ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list