[Bug-dejagnu] Update C++ include paths for libstdc++-v3

[Nick Clifton]

Hi Guys,

  The g++_include_flags and libstdc++_include_flags procedures are
  missing the top level target include directory.  This causes the GDB
  test gdb.c++/userdef.exp to fail because it cannot compile the test
  file.

  May I apply the following patch to fix this ?

Cheers
        Nick


2002-02-05  Nick Clifton  <address@hidden>

        * lib/libgloss.exp (g++_include_flags): Add top level
        libstdc++-v3 build include path, remove duplicate src path.
        (libstdc++_include_flags): Add top level libstdc++-v3 build
        include path.

Index: dejagnu/lib/libgloss.exp
===================================================================
RCS file: /cvs/src/src/dejagnu/lib/libgloss.exp,v
retrieving revision 1.4
diff -c -3 -p -w -r1.4 libgloss.exp
*** libgloss.exp        2002/01/17 11:52:59     1.4
--- libgloss.exp        2002/02/05 15:30:45
*************** proc g++_include_flags { args } {
*** 236,249 ****
  
      set dir [lookfor_file ${gccpath} libstdc++-v3]
      if { ${dir} != "" } {
!       append flags " -I${dir}/include/${target_alias}"
      }
  
-     set dir [lookfor_file ${srcdir} libstdc++-v3]
-     if { ${dir} != "" } {
-       append flags " -I${dir}/include -I${dir}/include/std"
-     }
-     
      set dir [lookfor_file ${srcdir} libstdc++]
      if { ${dir} != "" } {
        append flags " -I${dir} -I${dir}/stl"
--- 236,244 ----
  
      set dir [lookfor_file ${gccpath} libstdc++-v3]
      if { ${dir} != "" } {
!       append flags " -I${dir}/include -I${dir}/include/${target_alias}"
      }
  
      set dir [lookfor_file ${srcdir} libstdc++]
      if { ${dir} != "" } {
        append flags " -I${dir} -I${dir}/stl"
*************** proc libstdc++_include_flags { args } {
*** 329,335 ****
  
      set dir [lookfor_file ${gccpath} libstdc++-v3]
      if { ${dir} != "" } {
!       append flags " -I${dir}/include/${target_alias}"
      }
  
      set dir [lookfor_file ${srcdir} libstdc++]
--- 324,330 ----
  
      set dir [lookfor_file ${gccpath} libstdc++-v3]
      if { ${dir} != "" } {
!       append flags " -I${dir}/include -I${dir}/include/${target_alias}"
      }
  
      set dir [lookfor_file ${srcdir} libstdc++]