[PATCH] sid/component/tcl fails to compile using internal tcl at binutils checkouts

[Alon Bar-Lev <alon dot barlev at gmail dot com>]

Hello,

I initially reported this issue at binutils bugzilla [1].

I was referred to this list.

The build environment has the capacity to use in-tree tcl.

The sid/component/tcl is able to use this tcl, it does this by modifying the 
CPPFLAGS in its autoconf.

The problem is that the outer build environment overrides the CPPFLAGS with 
something else and put it into the environment, so when the sid/component/tcl 
Makefile is evaluated its CPPFLAGS is ignored.

Attached a simple fix for this issue, using the INCLUDE variable.

Regards,
Alon Bar-Lev.

[1] http://sourceware.org/bugzilla/show_bug.cgi?id=6987

---

Index: sid/component/tcl/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/tcl/Makefile.am,v
retrieving revision 1.5
diff -u -B -r1.5 Makefile.am
--- sid/component/tcl/Makefile.am	4 Aug 2001 11:32:17 -0000	1.5
+++ sid/component/tcl/Makefile.am	25 Oct 2008 22:29:30 -0000
@@ -5,7 +5,7 @@
 
 pkglib_LTLIBRARIES = libtclapi.la
 
-INCLUDES = -I. -I../../include -I$(srcdir)/../../include
+INCLUDES = -I. -I../../include -I$(srcdir)/../../include $(EXTRA_INCLUDES)
 
 pkgdata_DATA = sid-control-tksm.tk hw-visual-probe-bus.blt bridge-tcl.tcl bridge-tk.tk bridge-blt.blt bridge-tcl.txt sid-api-trace.tcl hw-visual-probe-pin.tk
 noinst_DATA = tester.tcl
Index: sid/component/tcl/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/tcl/configure.in,v
retrieving revision 1.4
diff -u -B -r1.4 configure.in
--- sid/component/tcl/configure.in	6 Feb 2003 20:27:37 -0000	1.4
+++ sid/component/tcl/configure.in	25 Oct 2008 22:30:26 -0000
@@ -64,7 +64,8 @@
 
 
 
-CPPFLAGS="$CPPFLAGS $with_tcl_include $with_tk_include $with_blt_include"
+EXTRA_INCLUDES="$with_tcl_include $with_tk_include $with_blt_include"
+AC_SUBST(EXTRA_INCLUDES)
 
 case "$host" in