[g++] find build_headers, toplevel

[Benjamin Kosnik <bkoz at redhat dot com>]

Top level changes to support target-dependent c++ includes.

See:
http://gcc.gnu.org/ml/gcc-patches/2000-12/msg00824.html

All these patches need to be checked in together: as long as there are
no huge objections, I'll check them in all at once.

tested x86/linux

2000-12-17  Benjamin Kosnik  <bkoz@redhat.com>

	* Makefile.in (BASE_FLAGS_TO_PASS): Alphabetize. 
	(libstdcxx_incdir): Pass down.
	* config.if: Remove expired bits for cxx_interface. 
	(libstdcxx_incdir): Add variable for g++ include directory.
	* configure.in (gxx_include_dir): Use it.

Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/egcs/Makefile.in,v
retrieving revision 1.66
diff -c -p -r1.66 Makefile.in
*** Makefile.in	2000/12/13 22:01:46	1.66
--- Makefile.in	2000/12/18 08:12:15
*************** BASE_FLAGS_TO_PASS = \
*** 370,375 ****
--- 370,377 ----
  	"libdir=$(libdir)" \
  	"libexecdir=$(libexecdir)" \
  	"lispdir=$(lispdir)" \
+ 	"libstdcxx_incdir=$(libstdcxx_incdir)" \
+ 	"libsubdir=$(libsubdir)" \
  	"localstatedir=$(localstatedir)" \
  	"mandir=$(mandir)" \
  	"oldincludedir=$(oldincludedir)" \
*************** BASE_FLAGS_TO_PASS = \
*** 382,389 ****
  	"gxx_include_dir=$(gxx_include_dir)" \
  	"gcc_version=$(gcc_version)" \
  	"gcc_version_trigger=$(gcc_version_trigger)" \
! 	"target_alias=$(target_alias)" \
! 	"libsubdir=$(libsubdir)"
  
  # Flags to pass down to most sub-makes, in which we're building with
  # the host environment.
--- 384,390 ----
  	"gxx_include_dir=$(gxx_include_dir)" \
  	"gcc_version=$(gcc_version)" \
  	"gcc_version_trigger=$(gcc_version_trigger)" \
! 	"target_alias=$(target_alias)" 
  
  # Flags to pass down to most sub-makes, in which we're building with
  # the host environment.
Index: config.if
===================================================================
RCS file: /cvs/gcc/egcs/config.if,v
retrieving revision 1.5
diff -c -p -r1.5 config.if
*** config.if	2000/10/16 16:00:43	1.5
--- config.if	2000/12/18 08:12:15
*************** else
*** 30,42 ****
    # We check libstdc++/Makefile.in for libstdcxx_interface.
    libstdcxx_interface=`grep "^INTERFACE" ${libstdcxx_srcdir}/Makefile.in | sed 's/INTERFACE[ 	]*=[ 	]*\(.*\)/\1/'`
  fi
  
- if [ -f ${if_topsrcdir}/gcc/cp/Makefile.in ]; then
- # We check gcc/cp for cxx_interface.
- cxx_interface=`grep "^INTERFACE" ${if_topsrcdir}/gcc/cp/Makefile.in | sed 's/INTERFACE[ 	]*=[ 	]*\(.*\)/\1/'`
- else
- cxx_interface=
- fi
  
  # The trickiest part is libc_interface.
  if [ -z "${libc_interface}" ]
--- 30,37 ----
    # We check libstdc++/Makefile.in for libstdcxx_interface.
    libstdcxx_interface=`grep "^INTERFACE" ${libstdcxx_srcdir}/Makefile.in | sed 's/INTERFACE[ 	]*=[ 	]*\(.*\)/\1/'`
  fi
+ libstdcxx_incdir=g++-${libstdcxx_interface}
  
  
  # The trickiest part is libc_interface.
  if [ -z "${libc_interface}" ]
Index: configure.in
===================================================================
RCS file: /cvs/gcc/egcs/configure.in,v
retrieving revision 1.82
diff -c -p -r1.82 configure.in
*** configure.in	2000/12/15 09:52:41	1.82
--- configure.in	2000/12/18 08:12:19
*************** if test x${gxx_include_dir} = x; then
*** 1314,1320 ****
      gxx_include_dir='${libsubdir}/include/g++'
    else
      . ${topsrcdir}/config.if
!     gxx_include_dir='${prefix}/include/g++'-${libstdcxx_interface}
    fi
  else
    gxx_include_dir=${gxx_include_dir}
--- 1314,1320 ----
      gxx_include_dir='${libsubdir}/include/g++'
    else
      . ${topsrcdir}/config.if
!     gxx_include_dir='${prefix}/include/${libstdcxx_incdir}'
    fi
  else
    gxx_include_dir=${gxx_include_dir}