From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id qNwRGd05l2CAbwAAWB0awg (envelope-from ) for ; Sat, 08 May 2021 21:24:45 -0400 Received: by simark.ca (Postfix, from userid 112) id 64B811F11C; Sat, 8 May 2021 21:24:45 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 4689D1E813 for ; Sat, 8 May 2021 21:24:43 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5068D388A02B; Sun, 9 May 2021 01:24:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5068D388A02B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1620523482; bh=OFYOLZD6ktFae/I/Wl74BPUdsetQd/bqurcnj+9mdlA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=jplRzT4WMjpZRFpiw6K3fz/vFy2FAjSW6azlGhHimUz7yzlHrje5wc1IrbA+XcKNg IM0xhsG3avuZz6nMq9fSDMn0lU1Ed4/U51dbncyDbFGv3RMBdiFIl0qU+uwgvPU/lp 6uDDXlrLGAhR/wKiK5ZMGKNtnCzfQeqBe1LX+lls= Received: from barracuda.ebox.ca (barracuda.ebox.ca [96.127.255.19]) by sourceware.org (Postfix) with ESMTPS id D188B388A02B for ; Sun, 9 May 2021 01:24:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D188B388A02B X-ASG-Debug-ID: 1620523473-0c856e6cd5124ac10001-fS2M51 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id K8TCITNTSg8O5hkB (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 08 May 2021 21:24:33 -0400 (EDT) X-Barracuda-Envelope-From: simon.marchi@polymtl.ca X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from simark.localdomain (192-222-157-6.qc.cable.ebox.net [192.222.157.6]) by smtp.ebox.ca (Postfix) with ESMTP id 01652441B21; Sat, 8 May 2021 21:24:32 -0400 (EDT) X-Barracuda-RBL-IP: 192.222.157.6 X-Barracuda-Effective-Source-IP: 192-222-157-6.qc.cable.ebox.net[192.222.157.6] X-Barracuda-Apparent-Source-IP: 192.222.157.6 To: gdb-patches@sourceware.org Subject: [PATCH] gdb: add ../config/pkg.m4 in acinclude.m4 Date: Sat, 8 May 2021 21:24:32 -0400 X-ASG-Orig-Subj: [PATCH] gdb: add ../config/pkg.m4 in acinclude.m4 Message-Id: <20210509012432.1154603-1-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Barracuda-Connect: smtp.ebox.ca[96.127.255.82] X-Barracuda-Start-Time: 1620523473 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Barracuda-BRTS-Status: 1 X-Virus-Scanned: by bsmtpd at ebox.ca X-Barracuda-Scan-Msg-Size: 2133 X-Barracuda-Spam-Score: 1.00 X-Barracuda-Spam-Status: No, SCORE=1.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests=BSF_RULE7568M, WEIRD_PORT X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.89806 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.50 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.50 BSF_RULE7568M Custom Rule 7568M X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Simon Marchi via Gdb-patches Reply-To: Simon Marchi Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Since commit adeab0c5b33f ("config/debuginfod: do not include pkg.m4 directly"), it no longer works to re-generate the autoconf stuff in GDB without passing "-I ../config": $ autoreconf -f configure.ac:161: error: possibly undefined macro: AC_MSG_ERROR If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:329: error: possibly undefined macro: AC_MSG_WARN configure.ac:409: error: possibly undefined macro: AC_DEFINE autoreconf: /opt/autostuff/2.69/bin/autoconf failed with exit status: 1 The reason is: since that commit, the PKG_CHECK_MODULES macro is not found. When passing "-I ../config" to the autoconf tools, then it's found. But if I understand correctly, the reason why we have all these includes in acinclude.m4 is to avoid having to specify that, to make the default invocation without special arguments "just work". So, add pkg.m4 to that list. gdb/ChangeLog: * acinclude.m4: Include ../config/pkg.m4. * aclocal.m4: Re-generate. Change-Id: I6c6ca833f225b6e9b954ae80f1ebc2e735dee4e4 --- gdb/acinclude.m4 | 3 +++ gdb/aclocal.m4 | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4 index 68520d6d9381..49704c5e7e3a 100644 --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -78,6 +78,9 @@ m4_include(ax_cxx_compile_stdcxx.m4) m4_include([../config/ax_pthread.m4]) +dnl For PKG_CHECK_MODULES, used by debuginfod configury code. +m4_include([../config/pkg.m4]) + dnl written by Guido Draheim , original by Alexandre Oliva dnl Version 1.3 (2001/03/02) dnl source http://www.gnu.org/software/ac-archive/Miscellaneous/ac_define_dir.html diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4 index cbea739c0e51..110b416e6156 100644 --- a/gdb/aclocal.m4 +++ b/gdb/aclocal.m4 @@ -199,5 +199,4 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../config/pkg.m4]) m4_include([acinclude.m4]) -- 2.30.1