[ecj] Patch: FYI: fix failing CNI test

[Tom Tromey]

I'm checking this in on gcj-eclipse-merge-branch.

Mark pointed out that one of the CNI tests was failing.  It turns out
I had a .h file in my build directory that hid this failure.

This patch fixes it.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>
	* testsuite/libjava.cni/cni.exp (gcj_cni_compile_cxx_to_o): Add -I
	for srcdir.

Index: testsuite/libjava.cni/cni.exp
===================================================================
--- testsuite/libjava.cni/cni.exp	(revision 120398)
+++ testsuite/libjava.cni/cni.exp	(working copy)
@@ -4,13 +4,13 @@
 # of options to pass to the compiler.  Returns 0 on failure, 1 on
 # success.
 proc gcj_cni_compile_cxx_to_o {file {options {}}} {
-  global srcdir
+  global srcdir subdir
 
   set name [file rootname [file tail $file]]
   set oname ${name}.o
 
   # Find the generated header.
-  lappend options "additional_flags=-I. -I.."
+  lappend options "additional_flags=-I. -I.. -I$srcdir/$subdir"
   # Find libgcj headers.
   lappend options "additional_flags=-I$srcdir/.."