* acinclude.m4(DJ_AC_STL): Also use

	AC_LANG_CPLUSPLUS so we build this test case with G++.
	* aclocal.m4, configure: Regenerated.
	* dejagnu.h: Don't use testout(), have each method print the array
	value directly, which is much simpler.
        * acinclude.m4(DJ_AC_STL): s/for for/for/.
        * dejagnu.h: Add conditional support for sstream.
        (testout): Likewise. Make return type `const'.

12 files changed, 61 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index efa0fc1..9c52815 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-05-28  Rob Savoye  <rob@peggyo.welcomehome.org>
+
+	* acinclude.m4(DJ_AC_STL): Also use
+	AC_LANG_CPLUSPLUS so we build this test case with G++.
+	* aclocal.m4, configure: Regenerated.
+	* dejagnu.h: Don't use testout(), have each method print the array
+	value directly, which is much simpler.
+
+2001-05-27  Jeffrey Oldham  <oldham@codesourcery.com>
+
+        * acinclude.m4(DJ_AC_STL): s/for for/for/.
+        * dejagnu.h: Add conditional support for sstream.
+        (testout): Likewise. Make return type `const'.
+
 2001-05-25  Rob Savoye  <rob@peggyo.welcomehome.org>
 
 	* acinclude.m4: Add DJ_AC_STL, which figures out if we're running
diff --git a/Makefile.am b/Makefile.am
index b49d6c8..ef14ecf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = dejagnu
 
 # Install all the associated data files
-SUBDIRS = doc testsuite example 
+SUBDIRS = doc testsuite example
 
 # Install the bourne shell script driver in the bindir
 bin_SCRIPTS = runtest
diff --git a/Makefile.in b/Makefile.in
index 9cb5adc..9198263 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,17 +62,19 @@ CONFIG = @CONFIG@
 CXX = @CXX@
 DOCBOOK = @DOCBOOK@
 EXEEXT = @EXEEXT@
+LEX = @LEX@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 TCLSH = @TCLSH@
 VERSION = @VERSION@
+YACC = @YACC@
 tclsh = @tclsh@
 
 AUTOMAKE_OPTIONS = dejagnu
 
 # Install all the associated data files
-SUBDIRS = doc testsuite example 
+SUBDIRS = doc testsuite example
 
 # Install the bourne shell script driver in the bindir
 bin_SCRIPTS = runtest
diff --git a/acinclude.m4 b/acinclude.m4
index 9f6cec4..e1dc275 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,6 +1,7 @@
 AC_DEFUN(DJ_AC_STL, [
-AC_MSG_CHECKING(for for STL versions)
+AC_MSG_CHECKING(for STL versions)
 AC_CACHE_VAL(ac_cv_stl,[
+  AC_LANG_CPLUSPLUS
   AC_TRY_COMPILE([#include <iostream>], [
   using namespace std;
   char bbuuff[5120];
@@ -11,6 +12,7 @@ AC_CACHE_VAL(ac_cv_stl,[
   ),
 ])
 
+AC_LANG_C
 if test x"${ac_cv_stl}" != x"v2" ; then  
   AC_MSG_RESULT(v3)
   AC_DEFINE(HAVE_STL3)
diff --git a/aclocal.m4 b/aclocal.m4
index f5b577e..f6571f5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -11,8 +11,9 @@ dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 
 AC_DEFUN(DJ_AC_STL, [
-AC_MSG_CHECKING(for for STL versions)
+AC_MSG_CHECKING(for STL versions)
 AC_CACHE_VAL(ac_cv_stl,[
+  AC_LANG_CPLUSPLUS
   AC_TRY_COMPILE([#include <iostream>], [
   using namespace std;
   char bbuuff[5120];
@@ -23,6 +24,7 @@ AC_CACHE_VAL(ac_cv_stl,[
   ),
 ])
 
+AC_LANG_C
 if test x"${ac_cv_stl}" != x"v2" ; then  
   AC_MSG_RESULT(v3)
   AC_DEFINE(HAVE_STL3)
diff --git a/configure b/configure
index c780689..48ec40b 100755
--- a/configure
+++ b/configure
@@ -1784,14 +1784,21 @@ TCLSH="${ac_cv_path_tclsh}"
 
 
 
-echo $ac_n "checking for for STL versions""... $ac_c" 1>&6
-echo "configure:1789: checking for for STL versions" >&5
+echo $ac_n "checking for STL versions""... $ac_c" 1>&6
+echo "configure:1789: checking for STL versions" >&5
 if eval "test \"`echo '$''{'ac_cv_stl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
+  ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
   cat > conftest.$ac_ext <<EOF
-#line 1795 "configure"
+#line 1802 "configure"
 #include "confdefs.h"
 #include <iostream>
 int main() {
@@ -1801,7 +1808,7 @@ int main() {
   cout.rdbuf()->pubsetbuf(bbuuff, 5120); 
 ; return 0; }
 EOF
-if { (eval echo configure:1805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_stl=v3
   
@@ -1817,6 +1824,13 @@ rm -f conftest*,
 fi
 
 
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
 if test x"${ac_cv_stl}" != x"v2" ; then  
   echo "$ac_t""v3" 1>&6
   cat >> confdefs.h <<\EOF
@@ -1950,7 +1964,7 @@ ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "Makefile doc/Makefile testsuite/Makefile example/Makefile
-testsuite/libdejagnu/Makefile unitparse/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+testsuite/libdejagnu/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -2052,7 +2066,7 @@ EOF
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile testsuite/Makefile example/Makefile
-testsuite/libdejagnu/Makefile unitparse/Makefile"}
+testsuite/libdejagnu/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/configure.in b/configure.in
index df387b9..4dd6225 100644
--- a/configure.in
+++ b/configure.in
@@ -34,5 +34,5 @@ AC_SUBST(CONFIG)
 AC_CONFIG_SUBDIRS(example/calc)
 
 AC_OUTPUT(Makefile doc/Makefile testsuite/Makefile example/Makefile
-testsuite/libdejagnu/Makefile unitparse/Makefile)
+testsuite/libdejagnu/Makefile)
 
diff --git a/dejagnu.h b/dejagnu.h
index 9d51c47..a2653f7 100644
--- a/dejagnu.h
+++ b/dejagnu.h
@@ -68,7 +68,11 @@ totals (void) {
 #include <iomanip>
 #include <fstream>
 #include <string>
+#if HAVE_STL3
+#include <sstream>
+#else
 #include <strstream>
+#endif
 
 char *outstate[] = {
     "FAILED: ",
@@ -110,16 +114,6 @@ OMANIP<int> testout(int i) {
 }
 #endif
 
-char *testout (int x) {
-  using namespace std;
-  const int len = 128;
-  static char buf[len];
-  static ostrstream oss(buf, len, ios::out);
-  oss.seekp(ios::beg);
-  oss << outstate[x] << ends;
-  return buf;
-}
-
 enum teststate {FAILED, PASSED,UNTESTED,UNRESOLVED} laststate;
 
 class TestState {
@@ -137,7 +131,6 @@ class TestState {
         totals();
     };
 
-
     void testrun (bool b, std::string s) {
         if (b)
             pass (s);
@@ -149,7 +142,7 @@ class TestState {
         passed++;
         laststate = PASSED;
         lastmsg = s;
-        std::cout << "\t" << testout(PASSED) << s << std::endl;
+        std::cout << "\t" << outstate[PASSED] << s << std::endl;
     }
     void pass (const char *c) {
         std::string s = c;
@@ -160,7 +153,7 @@ class TestState {
         failed++;
         laststate = FAILED;
         lastmsg = s;
-        std::cout << "\t" << testout(FAILED) << s << std::endl;
+        std::cout << "\t" << outstate[FAILED] << s << std::endl;
     }
     void fail (const char *c) {
         std::string s = c;
@@ -171,7 +164,7 @@ class TestState {
         untest++;
         laststate = UNTESTED;
         lastmsg = s;
-        std::cout << "\t" << testout(UNTESTED) << s << std::endl;
+        std::cout << "\t" << outstate[UNTESTED] << s << std::endl;
     }
     void untested (const char *c) {
         std::string s = c;
@@ -182,7 +175,7 @@ class TestState {
         unresolve++;
         laststate = UNRESOLVED;
         lastmsg = s;
-        std::cout << "\t" << testout(UNRESOLVED) << s << std::endl;
+        std::cout << "\t" << outstate[UNRESOLVED] << s << std::endl;
     }
     void unresolved (const char *c) {
         std::string s = c;
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 82830a5..97964f1 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -64,11 +64,13 @@ CC = @CC@
 CONFIG = @CONFIG@
 CXX = @CXX@
 EXEEXT = @EXEEXT@
+LEX = @LEX@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 TCLSH = @TCLSH@
 VERSION = @VERSION@
+YACC = @YACC@
 tclsh = @tclsh@
 
 man_MANS = runtest.1
diff --git a/example/Makefile.in b/example/Makefile.in
index a6c789f..85d967e 100644
--- a/example/Makefile.in
+++ b/example/Makefile.in
@@ -63,11 +63,13 @@ CONFIG = @CONFIG@
 CXX = @CXX@
 DOCBOOK = @DOCBOOK@
 EXEEXT = @EXEEXT@
+LEX = @LEX@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 TCLSH = @TCLSH@
 VERSION = @VERSION@
+YACC = @YACC@
 tclsh = @tclsh@
 
 AUTOMAKE_OPTIONS = dejagnu
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 6d5bee3..ceeec0a 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -63,11 +63,13 @@ CONFIG = @CONFIG@
 CXX = @CXX@
 DOCBOOK = @DOCBOOK@
 EXEEXT = @EXEEXT@
+LEX = @LEX@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 TCLSH = @TCLSH@
 VERSION = @VERSION@
+YACC = @YACC@
 tclsh = @tclsh@
 
 AUTOMAKE_OPTIONS = dejagnu
diff --git a/testsuite/libdejagnu/Makefile.in b/testsuite/libdejagnu/Makefile.in
index 4313a7e..8a8a5c8 100644
--- a/testsuite/libdejagnu/Makefile.in
+++ b/testsuite/libdejagnu/Makefile.in
@@ -65,11 +65,13 @@ CONFIG = @CONFIG@
 CXX = @CXX@
 DOCBOOK = @DOCBOOK@
 EXEEXT = @EXEEXT@
+LEX = @LEX@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 TCLSH = @TCLSH@
 VERSION = @VERSION@
+YACC = @YACC@
 tclsh = @tclsh@
 
 CFLAGS = -I$(top_srcdir) -g