staging headers fix (was Re: libstdc++ problem)

[Stephen M. Webb]

On Mon, 16 Jul 2001, Phil Edwards wrote:
> This patch moves the glibcpp_srcdir
> bits up to GLIBCPP_CONFIGURE, which should be safe because glibcpp_srcdir
> doesn't care whether we're cross-compiling.  Now C_INCLUDE_DIR can use
> glibcpp_srcdir.
> 
> With this patch, and reverting the workaround from yesterday, all symlinks
> are created with absolute paths even when using a relative-path configure.
> Can someone who was experiencing the original problem please test this?
> (Don't forget to run 'aclocal && autoconf'.)

With this patch (which looks orthogonal to yours, Phil) I get a successful
bootstrap on a clean CVS checkout (HEAD) this morning (uh, about 9:30 EST).
Without the patch, the bootstrap fails with the "bits/std_cstddef.h: No such
file or directory" error.  The libstdc++-v3 testsuite runs ok, but I can't seem
to get the gcc testsuite to run so I don't know for certain that it solves all
problems.  Certainly, gcj builds ok.

Note that "glibcpp_srcdir" does not need to be defined before the C_INCLUDE_DIR
macro is defined, since it's dereferenced by make and not autoconf.

Index: aclocal.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/aclocal.m4,v
retrieving revision 1.168
diff -c -3 -p -r1.168 aclocal.m4
*** aclocal.m4	2001/07/13 16:47:54	1.168
--- aclocal.m4	2001/07/16 16:52:28
*************** changequote([, ])
*** 1449,1464 ****
    case "$enable_cheaders" in
      c_shadow) 
          CSHADOW_FLAGS="-fno-builtin"
!         C_INCLUDE_DIR='${top_srcdir}/include/c_shadow'
          AC_DEFINE(_GLIBCPP_USE_SHADOW_HEADERS)
          ;;
      c_std)   
          CSHADOW_FLAGS=""
!         C_INCLUDE_DIR='${top_srcdir}/include/c_std'
          ;;
      c)   
          CSHADOW_FLAGS=""
!         C_INCLUDE_DIR='${top_srcdir}/include/c'
          ;;
    esac
  
--- 1449,1464 ----
    case "$enable_cheaders" in
      c_shadow) 
          CSHADOW_FLAGS="-fno-builtin"
!         C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_shadow'
          AC_DEFINE(_GLIBCPP_USE_SHADOW_HEADERS)
          ;;
      c_std)   
          CSHADOW_FLAGS=""
!         C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_std'
          ;;
      c)   
          CSHADOW_FLAGS=""
!         C_INCLUDE_DIR='${glibcpp_srcdir}/include/c'
          ;;
    esac