Fixup readline and sim including of override.m4

Fixup readline and sim including of override.m4

[Ralf Wildenhues]

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  <Ralf.Wildenhues@gmx.de>

	* configure.in: m4_include toplevel config/override.m4.
	* configure: Regenerate.

readline/ChangeLog.gdb:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure.in: m4_include toplevel config/override.m4.
	* configure: Regenerate.

sim/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure.ac:
	* configure: Regenerate.
	* avr/configure: Regenerate.
	* cris/configure: Regenerate.

sim/common/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* aclocal.m4: m4_include ../config/override.m4
	* configure: Regenerate.

sim/iq2000/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

sim/d10v/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

sim/igen/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

sim/m32r/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure (ac_fn_c_check_func, main):

sim/frv/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure (ac_fn_c_check_func, main):

sim/h8300/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

sim/mn10300/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

sim/ppc/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

sim/erc32/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

sim/arm/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

sim/m68hc11/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

sim/lm32/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

sim/sh64/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

sim/v850/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

sim/cr16/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

sim/moxie/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

sim/m32c/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure (ac_fn_c_check_func, main):

sim/mips/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure (ac_fn_c_check_func, main):

sim/mcore/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

sim/sh/ChangeLog:
2009-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* 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)
 

Re: Fixup readline and sim including of override.m4

[Paolo Bonzini]

On 08/21/2009 07:49 AM, Ralf Wildenhues wrote:
> 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)?

Ok unless someone complains in 24 hours.

Paolo