From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6538 invoked by alias); 21 Aug 2009 05:50:54 -0000 Received: (qmail 6512 invoked by uid 22791); 21 Aug 2009 05:50:51 -0000 X-SWARE-Spam-Status: No, hits=0.5 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_83,SPF_PASS,URIBL_BLACK X-Spam-Check-By: sourceware.org Received: from mail.gmx.net (HELO mail.gmx.net) (213.165.64.20) by sourceware.org (qpsmtpd/0.43rc1) with SMTP; Fri, 21 Aug 2009 05:50:27 +0000 Received: (qmail invoked by alias); 21 Aug 2009 05:50:24 -0000 Received: from xdsl-87-78-71-207.netcologne.de (EHLO localhost.localdomain) [87.78.71.207] by mail.gmx.net (mp002) with SMTP; 21 Aug 2009 07:50:24 +0200 Received: from ralf by localhost.localdomain with local (Exim 4.69) (envelope-from ) id 1MeN0e-00025Y-12; Fri, 21 Aug 2009 07:49:56 +0200 Date: Fri, 21 Aug 2009 05:50:00 -0000 From: Ralf Wildenhues To: cgen@sourceware.org, gdb-patches@sourceware.org Cc: Paolo Bonzini Subject: Fixup readline and sim including of override.m4 Message-ID: <20090821054955.GB8004@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-08-09) Mailing-List: contact cgen-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cgen-owner@sourceware.org X-SW-Source: 2009-q3/txt/msg00068.txt.bz2 Applying the fopen fixup to override.m4 and rebuilding the autotools update patch set made it clear that override.m4 wasn't consistently included everywhere in binutils+gdb yet. I used m4_include instead of m4_sinclude so that we'd learn about failures to include. Unfortunately, m4 inclusion doesn't work the way C '#include "sub/file"' works (starting relative from the current file) so that a sinclude would silently fail if a configure.in file were added that wasn't in a direct subdir of sim (due to the then-wrong relative paths). OK to squash this additional change in (or just commit it before the patch set)? I'll treat the missing parts of the src tree afterwards. Thanks, Ralf Fixup readline and sim including of override.m4 readline/examples/rlfe/ChangeLog: 2009-08-21 Ralf Wildenhues * configure.in: m4_include toplevel config/override.m4. * configure: Regenerate. readline/ChangeLog.gdb: 2009-08-21 Ralf Wildenhues * configure.in: m4_include toplevel config/override.m4. * configure: Regenerate. sim/ChangeLog: 2009-08-21 Ralf Wildenhues * configure.ac: * configure: Regenerate. * avr/configure: Regenerate. * cris/configure: Regenerate. sim/common/ChangeLog: 2009-08-21 Ralf Wildenhues * aclocal.m4: m4_include ../config/override.m4 * configure: Regenerate. sim/iq2000/ChangeLog: 2009-08-21 Ralf Wildenhues * configure: Regenerate. sim/d10v/ChangeLog: 2009-08-21 Ralf Wildenhues * configure: Regenerate. sim/igen/ChangeLog: 2009-08-21 Ralf Wildenhues * configure: Regenerate. sim/m32r/ChangeLog: 2009-08-21 Ralf Wildenhues * configure (ac_fn_c_check_func, main): sim/frv/ChangeLog: 2009-08-21 Ralf Wildenhues * configure (ac_fn_c_check_func, main): sim/h8300/ChangeLog: 2009-08-21 Ralf Wildenhues * configure: Regenerate. sim/mn10300/ChangeLog: 2009-08-21 Ralf Wildenhues * configure: Regenerate. sim/ppc/ChangeLog: 2009-08-21 Ralf Wildenhues * configure: Regenerate. sim/erc32/ChangeLog: 2009-08-21 Ralf Wildenhues * configure: Regenerate. sim/arm/ChangeLog: 2009-08-21 Ralf Wildenhues * configure: Regenerate. sim/m68hc11/ChangeLog: 2009-08-21 Ralf Wildenhues * configure: Regenerate. sim/lm32/ChangeLog: 2009-08-21 Ralf Wildenhues * configure: Regenerate. sim/sh64/ChangeLog: 2009-08-21 Ralf Wildenhues * configure: Regenerate. sim/v850/ChangeLog: 2009-08-21 Ralf Wildenhues * configure: Regenerate. sim/cr16/ChangeLog: 2009-08-21 Ralf Wildenhues * configure: Regenerate. sim/moxie/ChangeLog: 2009-08-21 Ralf Wildenhues * configure: Regenerate. sim/m32c/ChangeLog: 2009-08-21 Ralf Wildenhues * configure (ac_fn_c_check_func, main): sim/mips/ChangeLog: 2009-08-21 Ralf Wildenhues * configure (ac_fn_c_check_func, main): sim/mcore/ChangeLog: 2009-08-21 Ralf Wildenhues * configure: Regenerate. sim/sh/ChangeLog: 2009-08-21 Ralf Wildenhues * configure: Regenerate. diff --git a/readline/configure.in b/readline/configure.in index fbab795..528aef5 100644 --- a/readline/configure.in +++ b/readline/configure.in @@ -24,6 +24,8 @@ dnl Process this file with autoconf to produce a configure script. AC_REVISION([for Readline 5.1, version 2.59]) +m4_include([../config/override.m4]) + AC_INIT(readline, 5.1-release, bug-readline@gnu.org) dnl make sure we are using a recent autoconf version diff --git a/readline/examples/rlfe/configure.in b/readline/examples/rlfe/configure.in index a3d35e8..2bcdb1f 100644 --- a/readline/examples/rlfe/configure.in +++ b/readline/examples/rlfe/configure.in @@ -1,5 +1,7 @@ dnl Process this file with autoconf to produce a configure script. +m4_include([../../../config/override.m4]) + AC_INIT(rlfe.c) AC_CONFIG_HEADER(config.h) VERSION=0.4 diff --git a/sim/common/aclocal.m4 b/sim/common/aclocal.m4 index 25ed460..24b1aa2 100644 --- a/sim/common/aclocal.m4 +++ b/sim/common/aclocal.m4 @@ -18,6 +18,9 @@ # # SIM_AC_OUTPUT +# Include global overrides and fixes for Autoconf. +m4_include(../../config/override.m4) + AC_DEFUN([SIM_AC_COMMON], [ # autoconf.info says this should be called right after AC_INIT. diff --git a/sim/configure.ac b/sim/configure.ac index 13c50a7..9a55a0c 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -1,4 +1,5 @@ dnl Process this file with autoconf to produce a configure script. +m4_include([../config/override.m4]) AC_PREREQ(2.59)dnl AC_INIT(Makefile.in)