Index: acinclude.m4
===================================================================
RCS file: /cvsroot/dejagnu/dejagnu/acinclude.m4,v
retrieving revision 1.2
diff -c -p -r1.2 acinclude.m4
*** acinclude.m4	2001/05/26 05:55:28	1.2
--- acinclude.m4	2001/05/28 03:39:11
***************
*** 1,5 ****
  AC_DEFUN(DJ_AC_STL, [
! AC_MSG_CHECKING(for for STL versions)
  AC_CACHE_VAL(ac_cv_stl,[
    AC_TRY_COMPILE([#include <iostream>], [
    using namespace std;
--- 1,5 ----
  AC_DEFUN(DJ_AC_STL, [
! AC_MSG_CHECKING(for STL versions)
  AC_CACHE_VAL(ac_cv_stl,[
    AC_TRY_COMPILE([#include <iostream>], [
    using namespace std;
Index: configure
===================================================================
RCS file: /cvsroot/dejagnu/dejagnu/configure,v
retrieving revision 1.5
diff -c -p -r1.5 configure
*** configure	2001/05/26 05:55:28	1.5
--- configure	2001/05/28 03:39:13
***************
*** 2,8 ****
  
  # Guess values for system-dependent variables and create Makefiles.
  # Generated automatically using autoconf version 2.13 
! # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
  #
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
--- 2,8 ----
  
  # Guess values for system-dependent variables and create Makefiles.
  # Generated automatically using autoconf version 2.13 
! # Copyright (C) 1992, 93, 94, 95, 96, 01 Free Software Foundation, Inc.
  #
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
*************** TCLSH="${ac_cv_path_tclsh}"
*** 1784,1791 ****
  
  
  
! echo $ac_n "checking for for STL versions""... $ac_c" 1>&6
! echo "configure:1789: checking for for STL versions" >&5
  if eval "test \"`echo '$''{'ac_cv_stl'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1784,1799 ----
  
  
  
! echo $ac_n "checking for STL versions""... $ac_c" 1>&6
! echo "configure:1789: checking for STL versions" >&5
! 
! 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
! 
  if eval "test \"`echo '$''{'ac_cv_stl'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
Index: dejagnu.h
===================================================================
RCS file: /cvsroot/dejagnu/dejagnu/dejagnu.h,v
retrieving revision 1.3
diff -c -p -r1.3 dejagnu.h
*** dejagnu.h	2001/05/26 05:55:28	1.3
--- dejagnu.h	2001/05/28 03:39:13
*************** totals (void) {
*** 68,74 ****
--- 68,78 ----
  #include <iomanip>
  #include <fstream>
  #include <string>
+ #if HAVE_STL3
+ #include <sstream>
+ #else
  #include <strstream>
+ #endif
  
  char *outstate[] = {
      "FAILED: ",
*************** OMANIP<int> testout(int i) {
*** 110,123 ****
  }
  #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;
--- 114,136 ----
  }
  #endif
  
! const char *testout (int x) {
    using namespace std;
+ #if HAVE_STL3
+   string buf;
+   static ostringstream oss(buf, ios::out);
+ #else
    const int len = 128;
    static char buf[len];
    static ostrstream oss(buf, len, ios::out);
+ #endif // HAVE_STL3
    oss.seekp(ios::beg);
    oss << outstate[x] << ends;
+ #if HAVE_STL3
+   return buf.c_str();
+ #else
    return buf;
+ #endif // HAVE_STL3
  }
  
  enum teststate {FAILED, PASSED,UNTESTED,UNRESOLVED} laststate;
*************** class TestState {
*** 213,217 ****
  
  #endif		// __cplusplus
  #endif          // _DEJAGNU_H_
- 
  
--- 226,229 ----