From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2874 invoked by alias); 17 Jan 2013 11:08:22 -0000 Received: (qmail 2855 invoked by uid 22791); 17 Jan 2013 11:08:21 -0000 X-SWARE-Spam-Status: No, hits=-7.7 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 17 Jan 2013 11:08:17 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0HB8G1T009407 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 17 Jan 2013 06:08:16 -0500 Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r0HB8FWb032565; Thu, 17 Jan 2013 06:08:15 -0500 Message-ID: <50F7DB9F.3080904@redhat.com> Date: Thu, 17 Jan 2013 11:08:00 -0000 From: Pedro Alves User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Tom Tromey CC: gdb-patches@sourceware.org Subject: Re: Make autoreconf under gdb/ work (Re: RFC: automatic dependency tracking for gdbserver) References: <87r4n6vnqx.fsf@fleche.redhat.com> <50C1C285.5070904@redhat.com> <87pq2lx6qx.fsf@fleche.redhat.com> <50F703ED.9000609@redhat.com> <87zk08esnu.fsf@fleche.redhat.com> In-Reply-To: <87zk08esnu.fsf@fleche.redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2013-01/txt/msg00357.txt.bz2 On 01/16/2013 09:15 PM, Tom Tromey wrote: >>>>>> "Pedro" == Pedro Alves writes: > > Pedro> 2013-01-16 Pedro Alves > Pedro> * acinclude.m4: Include ../config/plugins.m4, > Pedro> ../config/largefile.m4, ../config/lead-dot.m4. Add comments. > Pedro> * Makefile.in (aclocal_m4_deps): Update. > Pedro> * aclocal.m4: Renegerate. > > Looks good to me. Applied, with ... > +# Keep these in sync with the includes in acinclude.s4. ^ ... this typo fixed, as noticed by Matt Rice. Thanks. 2013-01-17 Pedro Alves * acinclude.m4: Include ../config/plugins.m4, ../config/largefile.m4 and ../config/lead-dot.m4. Add comments. * Makefile.in (aclocal_m4_deps): Update. * aclocal.m4: Renegerate. --- gdb/Makefile.in | 11 +++++++---- gdb/acinclude.m4 | 17 +++++++++++++++-- gdb/aclocal.m4 | 3 --- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index beb5bcb..7305e6d 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1313,15 +1313,17 @@ config.status: $(srcdir)/configure configure.tgt configure.host ACLOCAL = aclocal ACLOCAL_AMFLAGS = -I ../config + +# Keep these in sync with the includes in acinclude.m4. aclocal_m4_deps = \ configure.ac \ acx_configure_dir.m4 \ - ../config/extensions.m4 \ - ../config/lead-dot.m4 \ - ../config/proginstall.m4 \ ../bfd/bfd.m4 \ ../config/acinclude.m4 \ + ../config/plugins.m4 \ + ../config/lead-dot.m4 \ ../config/override.m4 \ + ../config/largefile.m4 \ ../config/gettext-sister.m4 \ ../config/lib-ld.m4 \ ../config/lib-prefix.m4 \ @@ -1330,7 +1332,8 @@ aclocal_m4_deps = \ ../config/tcl.m4 \ ../config/depstand.m4 \ ../config/lcmessage.m4 \ - ../config/codeset.m4 + ../config/codeset.m4 \ + ../config/zlib.m4 $(srcdir)/aclocal.m4: @MAINTAINER_MODE_TRUE@ $(aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4 index 5399e40..25caddd 100644 --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -1,17 +1,30 @@ dnl written by Rob Savoye for Cygnus Support 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) dnl gdb/configure.in uses BFD_NEED_DECLARATION, so get its definition. sinclude(../bfd/bfd.m4) -dnl This gets the standard macros +dnl This gets the standard macros. sinclude(../config/acinclude.m4) -dnl This gets autoconf bugfixes +dnl This gets AC_PLUGINS, needed by ACX_LARGEFILE. +sinclude(../config/plugins.m4) + +dnl For ACX_LARGEFILE. +sinclude(../config/largefile.m4) + +dnl For AM_SET_LEADING_DOT. +sinclude(../config/lead-dot.m4) + +dnl This gets autoconf bugfixes. sinclude(../config/override.m4) +dnl For ZW_GNU_GETTEXT_SISTER_DIR. sinclude(../config/gettext-sister.m4) dnl For AC_LIB_HAVE_LINKFLAGS. diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4 index fdd8d08..7b546b7 100644 --- a/gdb/aclocal.m4 +++ b/gdb/aclocal.m4 @@ -106,7 +106,4 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../config/largefile.m4]) -m4_include([../config/lead-dot.m4]) -m4_include([../config/plugins.m4]) m4_include([acinclude.m4])