From patchwork Tue Oct 1 20:12:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 34781 Received: (qmail 42620 invoked by alias); 1 Oct 2019 20:12:46 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 42375 invoked by uid 89); 1 Oct 2019 20:12:45 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=75, 7.5, H*RU:100.42.49.5, H*RU:sk:cm11.we X-HELO: gateway23.websitewelcome.com Received: from gateway23.websitewelcome.com (HELO gateway23.websitewelcome.com) (192.185.49.218) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 01 Oct 2019 20:12:35 +0000 Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway23.websitewelcome.com (Postfix) with ESMTP id 1A236442B for ; Tue, 1 Oct 2019 15:12:32 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id FOVciQjPKVUVYFOVciDqRq; Tue, 01 Oct 2019 15:12:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=PzLrvbl293tf+sP0qpomlqsvnLxRQ3rUYkYwoZuYJIU=; b=Uwar9kIp6HS5uec8ULhj3cW+jJ ZRUizOwOxBfNA8j1hWPFf5xoDcYIC0bCQ9odECpoB391PW+HUQ0ivwHUwRVm0fm3ScilwGl5Vmizr akttWMaYE42kR/6rcCAilTGhb; Received: from 75-166-72-156.hlrn.qwest.net ([75.166.72.156]:47310 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1iFOVb-0023p5-UT; Tue, 01 Oct 2019 14:12:32 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v4 01/11] Use m4_include, not sinclude in .m4 files Date: Tue, 1 Oct 2019 14:12:17 -0600 Message-Id: <20191001201227.8519-2-tom@tromey.com> In-Reply-To: <20191001201227.8519-1-tom@tromey.com> References: <20191001201227.8519-1-tom@tromey.com> Pedro pointed out that sinclude does not error if a file is missing. This patch changes gdb to only use m4_include, which seems more correct. gdb/ChangeLog 2019-10-01 Tom Tromey * configure: Rebuild. * acinclude.m4: Use m4_include, not sinclude. gdb/gdbserver/ChangeLog 2019-10-01 Tom Tromey * configure: Rebuild. * acinclude.m4: Use m4_include, not sinclude. gdb/testsuite/ChangeLog 2019-10-01 Tom Tromey * configure: Rebuild. * aclocal.m4: Use m4_include, not sinclude. --- gdb/ChangeLog | 5 +++++ gdb/acinclude.m4 | 44 +++++++++++++++++++------------------- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/acinclude.m4 | 10 ++++----- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/aclocal.m4 | 6 +++--- 6 files changed, 45 insertions(+), 30 deletions(-) diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4 index 6e81aaed3bf..5f1358b8207 100644 --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -4,64 +4,64 @@ dnl major rewriting for Tcl 7.5 by Don Libes # Keep these includes in sync with the aclocal_m4_deps list in # Makefile.in. -sinclude(acx_configure_dir.m4) +m4_include(acx_configure_dir.m4) # This gets GDB_AC_TRANSFORM. -sinclude(transform.m4) +m4_include(transform.m4) # This gets AM_GDB_WARNINGS. -sinclude(warning.m4) +m4_include(warning.m4) # AM_GDB_UBSAN -sinclude(sanitize.m4) +m4_include(sanitize.m4) # This gets GDB_AC_SELFTEST. -sinclude(selftest.m4) +m4_include(selftest.m4) dnl gdb/configure.in uses BFD_NEED_DECLARATION, so get its definition. -sinclude(../bfd/bfd.m4) +m4_include(../bfd/bfd.m4) dnl This gets the standard macros. -sinclude(../config/acinclude.m4) +m4_include(../config/acinclude.m4) dnl This gets AC_PLUGINS, needed by ACX_LARGEFILE. -sinclude(../config/plugins.m4) +m4_include(../config/plugins.m4) dnl For ACX_LARGEFILE. -sinclude(../config/largefile.m4) +m4_include(../config/largefile.m4) dnl For AM_SET_LEADING_DOT. -sinclude(../config/lead-dot.m4) +m4_include(../config/lead-dot.m4) dnl This gets autoconf bugfixes. -sinclude(../config/override.m4) +m4_include(../config/override.m4) dnl For ZW_GNU_GETTEXT_SISTER_DIR. -sinclude(../config/gettext-sister.m4) +m4_include(../config/gettext-sister.m4) dnl For AC_LIB_HAVE_LINKFLAGS. -sinclude(../config/lib-ld.m4) -sinclude(../config/lib-prefix.m4) -sinclude(../config/lib-link.m4) +m4_include(../config/lib-ld.m4) +m4_include(../config/lib-prefix.m4) +m4_include(../config/lib-link.m4) dnl For ACX_PKGVERSION and ACX_BUGURL. -sinclude(../config/acx.m4) +m4_include(../config/acx.m4) dnl for TCL definitions -sinclude(../config/tcl.m4) +m4_include(../config/tcl.m4) dnl For dependency tracking macros. -sinclude([../config/depstand.m4]) +m4_include([../config/depstand.m4]) dnl For AM_LC_MESSAGES -sinclude([../config/lcmessage.m4]) +m4_include([../config/lcmessage.m4]) dnl For AM_LANGINFO_CODESET. -sinclude([../config/codeset.m4]) +m4_include([../config/codeset.m4]) -sinclude([../config/iconv.m4]) +m4_include([../config/iconv.m4]) -sinclude([../config/zlib.m4]) +m4_include([../config/zlib.m4]) m4_include([gdbsupport/common.m4]) diff --git a/gdb/gdbserver/acinclude.m4 b/gdb/gdbserver/acinclude.m4 index 3887b165c66..880c03ac1db 100644 --- a/gdb/gdbserver/acinclude.m4 +++ b/gdb/gdbserver/acinclude.m4 @@ -1,16 +1,16 @@ dnl gdb/gdbserver/configure.in uses BFD_HAVE_SYS_PROCFS_TYPE. -sinclude(../../bfd/bfd.m4) +m4_include(../../bfd/bfd.m4) -sinclude(../acx_configure_dir.m4) +m4_include(../acx_configure_dir.m4) # This gets AM_GDB_WARNINGS. -sinclude(../warning.m4) +m4_include(../warning.m4) dnl This gets autoconf bugfixes -sinclude(../../config/override.m4) +m4_include(../../config/override.m4) dnl For ACX_PKGVERSION and ACX_BUGURL. -sinclude(../../config/acx.m4) +m4_include(../../config/acx.m4) m4_include(../../config/depstand.m4) m4_include(../../config/lead-dot.m4) diff --git a/gdb/testsuite/aclocal.m4 b/gdb/testsuite/aclocal.m4 index d40c3a9fc6a..5061eef5372 100644 --- a/gdb/testsuite/aclocal.m4 +++ b/gdb/testsuite/aclocal.m4 @@ -1,6 +1,6 @@ -sinclude(../../config/acx.m4) -sinclude(../../config/override.m4) -sinclude(../transform.m4) +m4_include(../../config/acx.m4) +m4_include(../../config/override.m4) +m4_include(../transform.m4) # AM_CONDITIONAL -*- Autoconf -*-