From 4afdac6d1cdc3a83669cedd912fac090e99eda61 Mon Sep 17 00:00:00 2001
From: Benjamin Kosnik <bkoz@gcc.gnu.org>
Date: Tue, 27 Jun 2000 18:01:32 +0000
Subject: [PATCH] mkcheck.in: Add support to print standard flags needed to
 test g++ in build tree.

2000-06-27  H.J. Lu  <hjl@gnu.org>
            Loren J. Rittle  <ljrittle@acm.org>

        * mkcheck.in: Add support to print standard flags needed to
        test g++ in build tree.  Enhance command line error checking.

From-SVN: r34736
---
 libstdc++-v3/ChangeLog  | 25 +++++++++++++++++++++++--
 libstdc++-v3/mkcheck.in | 36 ++++++++++++++++++++++--------------
 2 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3f149c50399..ced2db5c6f8 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,24 @@
+2000-06-26  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>
+
+	Update to SGI STL 3.3
+	* bits/stl_algo.h: Update.
+	* ext/ropeimpl.h: Update.
+	* bits/std_memory.h: Update.
+	* bits/std_bitset.h: Update.
+
+	* src/Makefile.am (headers): Add new files.
+	* src/Makefile.in: Regenerate.
+	* bits/concept_checks.h: New file.
+	* bits/container_concepts.h: New file.
+	* bits/sequence_concepts.h: New file.
+	* src/stl-inst.cc (std): Add instantiation for __sink_unused_warning.
+	
+2000-06-27  H.J. Lu  <hjl@gnu.org>
+            Loren J. Rittle  <ljrittle@acm.org>
+
+        * mkcheck.in: Add support to print standard flags needed to
+        test g++ in build tree.  Enhance command line error checking.
+
 2000-06-27  Phil Edwards  <pme@sourceware.cygnus.com>
 
 	* docs/install.html:  Fix minor typo as reported.
@@ -19,8 +40,8 @@
 	  copying them to $TEST_DIR.
 
         * testsuite/27_io/ostream_inserter_arith.cc: Renamed
-          __TEST_NUMPUT_VERBOSE to TEST_NUMPUT_VERBOSE.
-        Define TEST_NUMPUT_VERBOSE only if DEBUG_ASSERT.
+	  __TEST_NUMPUT_VERBOSE to TEST_NUMPUT_VERBOSE.  Define
+	  TEST_NUMPUT_VERBOSE only if DEBUG_ASSERT.
 	
 2000-06-23  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>
 
diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in
index 22920fc034e..298fbae33e4 100755
--- a/libstdc++-v3/mkcheck.in
+++ b/libstdc++-v3/mkcheck.in
@@ -8,28 +8,31 @@
 # shared linkage.
 
 # Invocation 
-# mkcheck [01] (path to build) (path to src) (path to install)
-
-if [ $# != 3 ] && [ $# != 4 ]; then
-    echo 'Usage: mkcheck 0 (path to build) (path to src)'
-    echo '       mkcheck 1 (path to build) (path to src) (path to install)'
-    exit 1
-fi
-echo "running mkcheck"
+# mkcheck [012] (path to build) (path to src) (path to install)
 
 #
 # 1: variables
 #
-# WHICH determines if you are testing the installed binary and headers, or
-# the build binary and headers.
+# WHICH determines if you are
+# (0) testing the build binary and headers, or
+# (1) testing the installed binary and headers, or
+# (2) testing under dejagnu (just print the standard flags needed).
 WHICH=$1
-if [ $WHICH != "1" ]; then
-  WHICH=0
+if [ "$WHICH"x = 0x ] && [ $# -eq 3 ]; then
+  echo "running mkcheck"
   echo "$0: testing the build directory"
-elif [ $WHICH -eq 1 ]; then
+elif [ "$WHICH"x = 1x ] && [ $# -eq 4 ]; then
+  echo "running mkcheck"
   echo "$0: testing the install directory $4"
+elif [ "$WHICH"x = 2x ] && [ $# -eq 3 ]; then
+  true
+else
+  echo 'Usage: mkcheck 0 (path to build) (path to src)'
+  echo '       mkcheck 1 (path to build) (path to src) (path to install)'
+  echo '       mkcheck 2 (path to build) (path to src)'
+  exit 1;
 fi
-
+  
 BUILD_DIR=$2
 if [ ! -d "$BUILD_DIR" ]; then
   echo "build directory $BUILD_DIR not found, exiting."
@@ -57,6 +60,11 @@ elif [ $WHICH -eq 1 ]; then
   INC_PATH=""
 fi
 
+if [ $WHICH -eq 2 ]; then
+  echo $INC_PATH -I$SRC_DIR/backward -I$SRC_DIR/ext
+  exit 0;
+fi
+
 #LIB_PATH == where to find the build library binaries.
 if [ $WHICH != "1" ]; then
   LIB_PATH="$BUILD_DIR/src/.libs"