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

[Phil Edwards]

On Mon, Jul 16, 2001 at 01:16:23PM -0400, Phil Edwards wrote:
> Can you go ahead and check this in, and either remove
> or comment out the 'ac_cv_prog_LN_S' assignment, so we have symlinks again?

He doesn't have write privs, so I've checked it in.



2001-07-16  Stephen M. Webb  <stephen@bregmasoft.com>

	* acinclude.m4 (GLIBCPP_ENABLE_CHEADERS):  Use glibcpp_srcdir when
	setting C_INCLUDE_DIR.
	* configure.in:  Revert yesterday's LN_S change.
	* aclocal.m4:  Regenerate.
	* configure:  Regenerate.


Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.166
diff -u -3 -p -r1.166 acinclude.m4
--- acinclude.m4	2001/07/13 16:47:54	1.166
+++ acinclude.m4	2001/07/16 17:40:56
@@ -1437,16 +1437,16 @@ changequote([, ])
   case "$enable_cheaders" in
     c_shadow) 
         CSHADOW_FLAGS="-fno-builtin"
-        C_INCLUDE_DIR='${top_srcdir}/include/c_shadow'
+        C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_shadow'
         AC_DEFINE(_GLIBCPP_USE_SHADOW_HEADERS)
         ;;
     c_std)   
         CSHADOW_FLAGS=""
-        C_INCLUDE_DIR='${top_srcdir}/include/c_std'
+        C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_std'
         ;;
     c)   
         CSHADOW_FLAGS=""
-        C_INCLUDE_DIR='${top_srcdir}/include/c'
+        C_INCLUDE_DIR='${glibcpp_srcdir}/include/c'
         ;;
   esac
 
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.in,v
retrieving revision 1.68
diff -u -3 -p -r1.68 configure.in
--- configure.in	2001/07/15 22:17:43	1.68
+++ configure.in	2001/07/16 17:41:05
@@ -38,7 +38,7 @@ AC_SUBST(target_alias)
 
 # Will set LN_S to either 'ln -s' or 'ln'.  With autoconf 2.50+, can also
 # be 'cp -p' if linking isn't available.
-ac_cv_prog_LN_S='cp -p'
+#ac_cv_prog_LN_S='cp -p'
 AC_PROG_LN_S
 
 # We use these options to decide which functions to include.