* Makefile.in (site.exp): Define HAVE_LIBSTDCXX_V3.

	* configure.in (enable-libstdcxx-v3): Arrange to have
	HAVE_LIBSTDCXX_V3 substituted into the output files.

	* lib/g++.exp (g++_include_flags): Trust HAVE_LIBSTDCXX_V3
	to tell us whether or not we are using V3.

	* Makefile.in (check): Don't make mkcheck executable.
	(check-install): Likewise.
	* configure.in (AC_OUTPUT): Make mkcheck executable.
	* mkcheck.in (top_srcdir): New variable.
	(INC_PATH): Set the path to the backward and ext directories
	correctly.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37068 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 18 insertions, 6 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 113e7ef4128..b1c0457498f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2000-10-25  Mark Mitchell  <mark@codesourcery.com>
+
+	* Makefile.in (check): Don't make mkcheck executable.
+	(check-install): Likewise.
+	* configure.in (AC_OUTPUT): Make mkcheck executable.
+	* mkcheck.in (top_srcdir): New variable.
+	(INC_PATH): Set the path to the backward and ext directories
+	correctly.
+	
 2000-10-25  Phil Edwards  <pme@sources.redhat.com>
 
         * configure.in:  Check for gconv.h.
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index 24c086f18b4..793b83c5159 100644
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2000 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -407,11 +407,9 @@ mostlyclean distclean maintainer-clean
 # because then the paths will be full pathnames, not relative
 # pathnames. (-Wl,--rpath seems to like this better.)
 check:  $(top_builddir)/mkcheck
-	chmod +x  $(top_builddir)/mkcheck
 	$(top_builddir)/mkcheck 0 `pwd` $(top_srcdir)
 
 check-install: $(top_builddir)/mkcheck
-	chmod +x  $(top_builddir)/mkcheck
 	$(top_builddir)/mkcheck 1 `pwd` $(top_srcdir) $(prefix)
 
 # Multilib Makefile bits.
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index e3c0fd57ffc..6a97f8b31ac 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -1,6 +1,6 @@
 dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999, 2000 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index d2603a27800..dda142fc13a 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -19327,6 +19327,8 @@ if test -n "$CONFIG_FILES"; then
   ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
   grep '^MULTISUBDIR =' Makefile >> src/Makefile
 fi
+chmod +x mkcheck
+
 exit 0
 EOF
 chmod +x $CONFIG_STATUS
diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in
index 1ffc0cb9c63..43156719c4b 100644
--- a/libstdc++-v3/configure.in
+++ b/libstdc++-v3/configure.in
@@ -223,7 +223,9 @@ AC_OUTPUT(mkcheck Makefile src/Makefile libmath/Makefile libio/Makefile libsupc+
 [if test -n "$CONFIG_FILES"; then
   ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
   grep '^MULTISUBDIR =' Makefile >> src/Makefile
-fi],
+fi
+chmod +x mkcheck
+],
 srcdir=${srcdir}
 host=${host}
 target=${target}
diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in
index ac74673bf02..a2e4e15fc4c 100755
--- a/libstdc++-v3/mkcheck.in
+++ b/libstdc++-v3/mkcheck.in
@@ -54,6 +54,7 @@ if [ $WHICH -eq 1 ]; then
 fi
 
 # INC_PATH == include path to new headers for use on gcc command-line
+top_srcdir=@top_srcdir@
 C_DIR="`basename @C_INCLUDE_DIR@`"
 if [ $WHICH != "1" ]; then
   INC_PATH="@CSHADOW_FLAGS@ -I$BUILD_DIR -I$BUILD_DIR/libio \
@@ -65,7 +66,7 @@ elif [ $WHICH -eq 1 ]; then
 fi
 
 if [ $WHICH -eq 2 ]; then
-  echo $INC_PATH -I$SRC_DIR/backward -I$SRC_DIR/ext
+  echo $INC_PATH -I$SRC_DIR/include/backward -I$SRC_DIR/include/ext
   exit 0;
 fi