num_put_members_wchar_t.cc (test03): Use _GLIBCPP_HAVE_SETENV.

2002-01-24   Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/22_locale/num_put_members_wchar_t.cc (test03): Use
	_GLIBCPP_HAVE_SETENV.
	* testsuite/22_locale/codecvt_members_wchar_t_char.cc (test02): Same.
	* testsuite/22_locale/collate_members_char.cc (test02): Same.
	* testsuite/22_locale/ctype_members_char.cc (test03): Same.
	* testsuite/22_locale/ctype_members_wchar_t.cc (test03): Same.
	* testsuite/22_locale/messages_members_char.cc (test02): Same.
	* testsuite/22_locale/moneypunct_members_char.cc (test02): Same.
	* testsuite/22_locale/moneypunct_members_wchar_t.cc (test02): Same.
	* testsuite/22_locale/money_put_members_char.cc (test04): Same.
	* testsuite/22_locale/money_put_members_wchar_t.cc (test04): Same.
	* testsuite/22_locale/num_get_members_char.cc (test03): Same.
	* testsuite/22_locale/num_get_members_wchar_t.cc (test03): Same.
	* testsuite/22_locale/numpunct_members_char.cc (test02): Same.
	* testsuite/22_locale/numpunct_members_wchar_t.cc (test02): Same.
	* testsuite/22_locale/time_get_members_char.cc (test07): Same.
	* testsuite/22_locale/time_get_members_wchar_t.cc (test07): Same.
	* testsuite/22_locale/time_put_members_char.cc (test03): Same.
	* testsuite/22_locale/time_put_members_wchar_t.cc (test03): Same.
	* testsuite/22_locale/num_put_members_char.cc (test03): Same.
	* acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): Check for setenv.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.
	* config.h.in: Regenerate.

From-SVN: r49191

libstdc++-v3/ChangeLog

+2002-01-24   Benjamin Kosnik  <bkoz@redhat.com>
+
+	* testsuite/22_locale/num_put_members_wchar_t.cc (test03): Use
+	_GLIBCPP_HAVE_SETENV.
+	* testsuite/22_locale/codecvt_members_wchar_t_char.cc (test02): Same.
+	* testsuite/22_locale/collate_members_char.cc (test02): Same.
+	* testsuite/22_locale/ctype_members_char.cc (test03): Same.
+	* testsuite/22_locale/ctype_members_wchar_t.cc (test03): Same.
+	* testsuite/22_locale/messages_members_char.cc (test02): Same.
+	* testsuite/22_locale/moneypunct_members_char.cc (test02): Same.
+	* testsuite/22_locale/moneypunct_members_wchar_t.cc (test02): Same.
+	* testsuite/22_locale/money_put_members_char.cc (test04): Same.
+	* testsuite/22_locale/money_put_members_wchar_t.cc (test04): Same.
+	* testsuite/22_locale/num_get_members_char.cc (test03): Same.
+	* testsuite/22_locale/num_get_members_wchar_t.cc (test03): Same.
+	* testsuite/22_locale/numpunct_members_char.cc (test02): Same.
+	* testsuite/22_locale/numpunct_members_wchar_t.cc (test02): Same.
+	* testsuite/22_locale/time_get_members_char.cc (test07): Same.
+	* testsuite/22_locale/time_get_members_wchar_t.cc (test07): Same.
+	* testsuite/22_locale/time_put_members_char.cc (test03): Same.
+	* testsuite/22_locale/time_put_members_wchar_t.cc (test03): Same.
+	* testsuite/22_locale/num_put_members_char.cc (test03): Same.
+	* acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): Check for setenv.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+	* config.h.in: Regenerate.
+	
 2002-01-23  Loren Rittle <ljrittle@acm.org>
 
 	* testsuite/thread/pthread1.cc: New test.

libstdc++-v3/acinclude.m4

@@ -1936,6 +1936,9 @@ dnl
 dnl GLIBCPP_CONFIGURE_TESTSUITE  [no args]
 AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
   GLIBCPP_CHECK_SETRLIMIT
+
+  # Look for setenv, so that extended locale tests can be performed.
+  AC_CHECK_FUNCS(setenv)
 ])
 
 

libstdc++-v3/aclocal.m4

@@ -1948,6 +1948,9 @@ dnl
 dnl GLIBCPP_CONFIGURE_TESTSUITE  [no args]
 AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
   GLIBCPP_CHECK_SETRLIMIT
+
+  # Look for setenv, so that extended locale tests can be performed.
+  AC_CHECK_FUNCS(setenv)
 ])
 
 

libstdc++-v3/config.h.in

@@ -498,6 +498,9 @@
 /* Define if you have the qfpclass function.  */
 #undef HAVE_QFPCLASS
 
+/* Define if you have the setenv function.  */
+#undef HAVE_SETENV
+
 /* Define if you have the signbitl function.  */
 #undef HAVE_SIGNBITL
 

libstdc++-v3/configure

@@ -18998,6 +18998,63 @@ EOF
   echo "$ac_t""$ac_mem_limits" 1>&6
 
 
+  # Look for setenv, so that extended locale tests can be performed.
+  for ac_func in setenv
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:19006: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 19011 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:19034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
 fi
 
 
@@ -19087,13 +19144,13 @@ glibcpp_toolexeclibdir=no
 glibcpp_prefixdir=${prefix}
 
 echo $ac_n "checking for interface version number""... $ac_c" 1>&6
-echo "configure:19091: checking for interface version number" >&5
+echo "configure:19148: checking for interface version number" >&5
 libstdcxx_interface=$INTERFACE
 echo "$ac_t""$libstdcxx_interface" 1>&6
 
 # Process the option --with-gxx-include-dir=<path to include-files directory>
 echo $ac_n "checking for --with-gxx-include-dir""... $ac_c" 1>&6
-echo "configure:19097: checking for --with-gxx-include-dir" >&5
+echo "configure:19154: checking for --with-gxx-include-dir" >&5
 # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
 if test "${with_gxx_include_dir+set}" = set; then
   withval="$with_gxx_include_dir"
@@ -19117,7 +19174,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6
 
 # Process the option "--enable-version-specific-runtime-libs"
 echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6
-echo "configure:19121: checking for --enable-version-specific-runtime-libs" >&5
+echo "configure:19178: checking for --enable-version-specific-runtime-libs" >&5
 # Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given.
 if test "${enable_version_specific_runtime_libs+set}" = set; then
   enableval="$enable_version_specific_runtime_libs"
@@ -19164,7 +19221,7 @@ if test x"$glibcpp_toolexecdir" = x"no"; then
 fi
 
 echo $ac_n "checking for install location""... $ac_c" 1>&6
-echo "configure:19168: checking for install location" >&5
+echo "configure:19225: checking for install location" >&5
 echo "$ac_t""$gxx_include_dir" 1>&6
 
 

libstdc++-v3/include/Makefile.in

@@ -158,53 +158,279 @@ glibcpp_builddir = @glibcpp_builddir@
 
 bits_srcdir = ${glibcpp_srcdir}/include/bits
 bits_builddir = ./bits
-bits_headers =  	${bits_srcdir}/basic_file.h 	${bits_srcdir}/basic_ios.h 	${bits_srcdir}/basic_ios.tcc 	${bits_srcdir}/basic_string.h 	${bits_srcdir}/basic_string.tcc 	${bits_srcdir}/boost_concept_check.h 	${bits_srcdir}/char_traits.h 	${bits_srcdir}/codecvt.h 	${bits_srcdir}/concept_check.h 	${bits_srcdir}/cpp_type_traits.h 	${bits_srcdir}/fpos.h 	${bits_srcdir}/fstream.tcc 	${bits_srcdir}/functexcept.h 	${bits_srcdir}/generic_shadow.h 	${bits_srcdir}/gslice.h 	${bits_srcdir}/gslice_array.h 	${bits_srcdir}/indirect_array.h 	${bits_srcdir}/ios_base.h 	${bits_srcdir}/istream.tcc 	${bits_srcdir}/locale_facets.h 	${bits_srcdir}/locale_facets.tcc 	${bits_srcdir}/localefwd.h 	${bits_srcdir}/mask_array.h 	${bits_srcdir}/ostream.tcc 	${bits_srcdir}/pthread_allocimpl.h 	${bits_srcdir}/stream_iterator.h 	${bits_srcdir}/streambuf_iterator.h 	${bits_srcdir}/slice.h 	${bits_srcdir}/slice_array.h 	${bits_srcdir}/sstream.tcc 	${bits_srcdir}/stl_algo.h 	${bits_srcdir}/stl_algobase.h 	${bits_srcdir}/stl_alloc.h 	${bits_srcdir}/stl_bvector.h 	${bits_srcdir}/stl_construct.h 	${bits_srcdir}/stl_deque.h 	${bits_srcdir}/stl_function.h 	${bits_srcdir}/stl_heap.h 	${bits_srcdir}/stl_iterator.h 	${bits_srcdir}/stl_iterator_base_funcs.h 	${bits_srcdir}/stl_iterator_base_types.h 	${bits_srcdir}/stl_list.h 	${bits_srcdir}/stl_map.h 	${bits_srcdir}/stl_multimap.h 	${bits_srcdir}/stl_multiset.h 	${bits_srcdir}/stl_numeric.h 	${bits_srcdir}/stl_pair.h 	${bits_srcdir}/stl_pthread_alloc.h 	${bits_srcdir}/stl_queue.h 	${bits_srcdir}/stl_raw_storage_iter.h 	${bits_srcdir}/stl_relops.h 	${bits_srcdir}/stl_set.h 	${bits_srcdir}/stl_stack.h 	${bits_srcdir}/stl_tempbuf.h 	${bits_srcdir}/stl_threads.h 	${bits_srcdir}/stl_tree.h 	${bits_srcdir}/stl_uninitialized.h 	${bits_srcdir}/stl_vector.h 	${bits_srcdir}/streambuf.tcc 	${bits_srcdir}/stringfwd.h 	${bits_srcdir}/type_traits.h 	${bits_srcdir}/valarray_array.h 	${bits_srcdir}/valarray_array.tcc 	${bits_srcdir}/valarray_meta.h
+bits_headers = \
+	${bits_srcdir}/basic_file.h \
+	${bits_srcdir}/basic_ios.h \
+	${bits_srcdir}/basic_ios.tcc \
+	${bits_srcdir}/basic_string.h \
+	${bits_srcdir}/basic_string.tcc \
+	${bits_srcdir}/boost_concept_check.h \
+	${bits_srcdir}/char_traits.h \
+	${bits_srcdir}/codecvt.h \
+	${bits_srcdir}/concept_check.h \
+	${bits_srcdir}/cpp_type_traits.h \
+	${bits_srcdir}/fpos.h \
+	${bits_srcdir}/fstream.tcc \
+	${bits_srcdir}/functexcept.h \
+	${bits_srcdir}/generic_shadow.h \
+	${bits_srcdir}/gslice.h \
+	${bits_srcdir}/gslice_array.h \
+	${bits_srcdir}/indirect_array.h \
+	${bits_srcdir}/ios_base.h \
+	${bits_srcdir}/istream.tcc \
+	${bits_srcdir}/locale_facets.h \
+	${bits_srcdir}/locale_facets.tcc \
+	${bits_srcdir}/localefwd.h \
+	${bits_srcdir}/mask_array.h \
+	${bits_srcdir}/ostream.tcc \
+	${bits_srcdir}/pthread_allocimpl.h \
+	${bits_srcdir}/stream_iterator.h \
+	${bits_srcdir}/streambuf_iterator.h \
+	${bits_srcdir}/slice.h \
+	${bits_srcdir}/slice_array.h \
+	${bits_srcdir}/sstream.tcc \
+	${bits_srcdir}/stl_algo.h \
+	${bits_srcdir}/stl_algobase.h \
+	${bits_srcdir}/stl_alloc.h \
+	${bits_srcdir}/stl_bvector.h \
+	${bits_srcdir}/stl_construct.h \
+	${bits_srcdir}/stl_deque.h \
+	${bits_srcdir}/stl_function.h \
+	${bits_srcdir}/stl_heap.h \
+	${bits_srcdir}/stl_iterator.h \
+	${bits_srcdir}/stl_iterator_base_funcs.h \
+	${bits_srcdir}/stl_iterator_base_types.h \
+	${bits_srcdir}/stl_list.h \
+	${bits_srcdir}/stl_map.h \
+	${bits_srcdir}/stl_multimap.h \
+	${bits_srcdir}/stl_multiset.h \
+	${bits_srcdir}/stl_numeric.h \
+	${bits_srcdir}/stl_pair.h \
+	${bits_srcdir}/stl_pthread_alloc.h \
+	${bits_srcdir}/stl_queue.h \
+	${bits_srcdir}/stl_raw_storage_iter.h \
+	${bits_srcdir}/stl_relops.h \
+	${bits_srcdir}/stl_set.h \
+	${bits_srcdir}/stl_stack.h \
+	${bits_srcdir}/stl_tempbuf.h \
+	${bits_srcdir}/stl_threads.h \
+	${bits_srcdir}/stl_tree.h \
+	${bits_srcdir}/stl_uninitialized.h \
+	${bits_srcdir}/stl_vector.h \
+	${bits_srcdir}/streambuf.tcc \
+	${bits_srcdir}/stringfwd.h \
+	${bits_srcdir}/type_traits.h \
+	${bits_srcdir}/valarray_array.h \
+	${bits_srcdir}/valarray_array.tcc \
+	${bits_srcdir}/valarray_meta.h
 
 
 backward_srcdir = ${glibcpp_srcdir}/include/backward
 backward_builddir = ./backward
-backward_headers =  	${backward_srcdir}/complex.h 	${backward_srcdir}/iomanip.h 	${backward_srcdir}/istream.h 	${backward_srcdir}/ostream.h 	${backward_srcdir}/stream.h 	${backward_srcdir}/streambuf.h 	${backward_srcdir}/algo.h 	${backward_srcdir}/algobase.h 	${backward_srcdir}/alloc.h 	${backward_srcdir}/bvector.h 	${backward_srcdir}/defalloc.h 	${backward_srcdir}/deque.h 	${backward_srcdir}/function.h 	${backward_srcdir}/hash_map.h 	${backward_srcdir}/hash_set.h 	${backward_srcdir}/hashtable.h 	${backward_srcdir}/heap.h 	${backward_srcdir}/iostream.h 	${backward_srcdir}/iterator.h 	${backward_srcdir}/list.h 	${backward_srcdir}/map.h 	${backward_srcdir}/multimap.h 	${backward_srcdir}/new.h 	${backward_srcdir}/multiset.h 	${backward_srcdir}/pair.h 	${backward_srcdir}/queue.h 	${backward_srcdir}/rope.h 	${backward_srcdir}/set.h 	${backward_srcdir}/slist.h 	${backward_srcdir}/stack.h 	${backward_srcdir}/tempbuf.h 	${backward_srcdir}/tree.h 	${backward_srcdir}/vector.h 	${backward_srcdir}/fstream.h 	${backward_srcdir}/strstream.h 	${backward_srcdir}/strstream 	${backward_srcdir}/backward_warning.h
+backward_headers = \
+	${backward_srcdir}/complex.h \
+	${backward_srcdir}/iomanip.h \
+	${backward_srcdir}/istream.h \
+	${backward_srcdir}/ostream.h \
+	${backward_srcdir}/stream.h \
+	${backward_srcdir}/streambuf.h \
+	${backward_srcdir}/algo.h \
+	${backward_srcdir}/algobase.h \
+	${backward_srcdir}/alloc.h \
+	${backward_srcdir}/bvector.h \
+	${backward_srcdir}/defalloc.h \
+	${backward_srcdir}/deque.h \
+	${backward_srcdir}/function.h \
+	${backward_srcdir}/hash_map.h \
+	${backward_srcdir}/hash_set.h \
+	${backward_srcdir}/hashtable.h \
+	${backward_srcdir}/heap.h \
+	${backward_srcdir}/iostream.h \
+	${backward_srcdir}/iterator.h \
+	${backward_srcdir}/list.h \
+	${backward_srcdir}/map.h \
+	${backward_srcdir}/multimap.h \
+	${backward_srcdir}/new.h \
+	${backward_srcdir}/multiset.h \
+	${backward_srcdir}/pair.h \
+	${backward_srcdir}/queue.h \
+	${backward_srcdir}/rope.h \
+	${backward_srcdir}/set.h \
+	${backward_srcdir}/slist.h \
+	${backward_srcdir}/stack.h \
+	${backward_srcdir}/tempbuf.h \
+	${backward_srcdir}/tree.h \
+	${backward_srcdir}/vector.h \
+	${backward_srcdir}/fstream.h \
+	${backward_srcdir}/strstream.h \
+	${backward_srcdir}/strstream \
+	${backward_srcdir}/backward_warning.h
 
 
 ext_srcdir = ${glibcpp_srcdir}/include/ext
 ext_builddir = ./ext
-ext_headers =  	${ext_srcdir}/algorithm 	${ext_srcdir}/functional 	${ext_srcdir}/hash_map 	${ext_srcdir}/hash_set 	${ext_srcdir}/iterator 	${ext_srcdir}/memory 	${ext_srcdir}/numeric 	${ext_srcdir}/rb_tree 	${ext_srcdir}/rope 	${ext_srcdir}/ropeimpl.h 	${ext_srcdir}/slist 	${ext_srcdir}/stl_hash_fun.h 	${ext_srcdir}/stl_hashtable.h 	${ext_srcdir}/stl_rope.h
+ext_headers = \
+	${ext_srcdir}/algorithm \
+	${ext_srcdir}/functional \
+	${ext_srcdir}/hash_map \
+	${ext_srcdir}/hash_set \
+	${ext_srcdir}/iterator \
+	${ext_srcdir}/memory \
+	${ext_srcdir}/numeric \
+	${ext_srcdir}/rb_tree \
+	${ext_srcdir}/rope \
+	${ext_srcdir}/ropeimpl.h \
+	${ext_srcdir}/slist \
+	${ext_srcdir}/stl_hash_fun.h \
+	${ext_srcdir}/stl_hashtable.h \
+	${ext_srcdir}/stl_rope.h
 
 
 # This is the common subset of files that all three "C" header models use.
 c_base_srcdir = @C_INCLUDE_DIR@
 c_base_builddir = .
-c_base_headers =  	${c_base_srcdir}/std_cassert.h 	${c_base_srcdir}/std_cctype.h 	${c_base_srcdir}/std_cerrno.h 	${c_base_srcdir}/std_cfloat.h 	${c_base_srcdir}/std_ciso646.h 	${c_base_srcdir}/std_climits.h 	${c_base_srcdir}/std_clocale.h 	${c_base_srcdir}/std_cmath.h 	${c_base_srcdir}/std_csetjmp.h 	${c_base_srcdir}/std_csignal.h 	${c_base_srcdir}/std_cstdarg.h 	${c_base_srcdir}/std_cstddef.h 	${c_base_srcdir}/std_cstdio.h 	${c_base_srcdir}/std_cstdlib.h 	${c_base_srcdir}/std_cstring.h 	${c_base_srcdir}/std_ctime.h 	${c_base_srcdir}/std_cwchar.h 	${c_base_srcdir}/std_cwctype.h 
+c_base_headers = \
+	${c_base_srcdir}/std_cassert.h \
+	${c_base_srcdir}/std_cctype.h \
+	${c_base_srcdir}/std_cerrno.h \
+	${c_base_srcdir}/std_cfloat.h \
+	${c_base_srcdir}/std_ciso646.h \
+	${c_base_srcdir}/std_climits.h \
+	${c_base_srcdir}/std_clocale.h \
+	${c_base_srcdir}/std_cmath.h \
+	${c_base_srcdir}/std_csetjmp.h \
+	${c_base_srcdir}/std_csignal.h \
+	${c_base_srcdir}/std_cstdarg.h \
+	${c_base_srcdir}/std_cstddef.h \
+	${c_base_srcdir}/std_cstdio.h \
+	${c_base_srcdir}/std_cstdlib.h \
+	${c_base_srcdir}/std_cstring.h \
+	${c_base_srcdir}/std_ctime.h \
+	${c_base_srcdir}/std_cwchar.h \
+	${c_base_srcdir}/std_cwctype.h 
 
 # Some of the "C" headers need extra files.
-c_base_headers_extra =  	${c_base_srcdir}/cmath.tcc 
-
-c_base_headers_rename =  	cassert 	cctype 	cerrno 	cfloat 	ciso646 	climits 	clocale 	cmath 	csetjmp 	csignal 	cstdarg 	cstddef 	cstdio 	cstdlib 	cstring 	ctime 	cwchar 	cwctype 
+c_base_headers_extra = \
+	${c_base_srcdir}/cmath.tcc 
+
+c_base_headers_rename = \
+	cassert \
+	cctype \
+	cerrno \
+	cfloat \
+	ciso646 \
+	climits \
+	clocale \
+	cmath \
+	csetjmp \
+	csignal \
+	cstdarg \
+	cstddef \
+	cstdio \
+	cstdlib \
+	cstring \
+	ctime \
+	cwchar \
+	cwctype 
 
 
 std_srcdir = ${glibcpp_srcdir}/include/std
 std_builddir = .
-std_headers =  	${std_srcdir}/std_algorithm.h 	${std_srcdir}/std_bitset.h 	${std_srcdir}/std_complex.h 	${std_srcdir}/std_deque.h 	${std_srcdir}/std_fstream.h 	${std_srcdir}/std_functional.h 	${std_srcdir}/std_iomanip.h 	${std_srcdir}/std_ios.h 	${std_srcdir}/std_iosfwd.h 	${std_srcdir}/std_iostream.h 	${std_srcdir}/std_istream.h 	${std_srcdir}/std_iterator.h 	${std_srcdir}/std_limits.h 	${std_srcdir}/std_list.h 	${std_srcdir}/std_locale.h 	${std_srcdir}/std_map.h 	${std_srcdir}/std_memory.h 	${std_srcdir}/std_numeric.h 	${std_srcdir}/std_ostream.h 	${std_srcdir}/std_queue.h 	${std_srcdir}/std_set.h 	${std_srcdir}/std_sstream.h 	${std_srcdir}/std_stack.h 	${std_srcdir}/std_stdexcept.h 	${std_srcdir}/std_streambuf.h 	${std_srcdir}/std_string.h 	${std_srcdir}/std_utility.h 	${std_srcdir}/std_valarray.h 	${std_srcdir}/std_vector.h
+std_headers = \
+	${std_srcdir}/std_algorithm.h \
+	${std_srcdir}/std_bitset.h \
+	${std_srcdir}/std_complex.h \
+	${std_srcdir}/std_deque.h \
+	${std_srcdir}/std_fstream.h \
+	${std_srcdir}/std_functional.h \
+	${std_srcdir}/std_iomanip.h \
+	${std_srcdir}/std_ios.h \
+	${std_srcdir}/std_iosfwd.h \
+	${std_srcdir}/std_iostream.h \
+	${std_srcdir}/std_istream.h \
+	${std_srcdir}/std_iterator.h \
+	${std_srcdir}/std_limits.h \
+	${std_srcdir}/std_list.h \
+	${std_srcdir}/std_locale.h \
+	${std_srcdir}/std_map.h \
+	${std_srcdir}/std_memory.h \
+	${std_srcdir}/std_numeric.h \
+	${std_srcdir}/std_ostream.h \
+	${std_srcdir}/std_queue.h \
+	${std_srcdir}/std_set.h \
+	${std_srcdir}/std_sstream.h \
+	${std_srcdir}/std_stack.h \
+	${std_srcdir}/std_stdexcept.h \
+	${std_srcdir}/std_streambuf.h \
+	${std_srcdir}/std_string.h \
+	${std_srcdir}/std_utility.h \
+	${std_srcdir}/std_valarray.h \
+	${std_srcdir}/std_vector.h
 
 # Renamed at build time. 
-std_headers_rename =  	algorithm 	bitset 	complex 	deque 	fstream 	functional 	iomanip 	ios 	iosfwd 	iostream 	istream 	iterator 	limits 	list 	locale 	map 	memory 	numeric 	ostream 	queue 	set 	sstream 	stack 	stdexcept 	streambuf 	string 	utility 	valarray 	vector
+std_headers_rename = \
+	algorithm \
+	bitset \
+	complex \
+	deque \
+	fstream \
+	functional \
+	iomanip \
+	ios \
+	iosfwd \
+	iostream \
+	istream \
+	iterator \
+	limits \
+	list \
+	locale \
+	map \
+	memory \
+	numeric \
+	ostream \
+	queue \
+	set \
+	sstream \
+	stack \
+	stdexcept \
+	streambuf \
+	string \
+	utility \
+	valarray \
+	vector
 
 
 target_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@
 target_builddir = ./${target_alias}/bits
-target_headers =  	${target_srcdir}/ctype_base.h 	${target_srcdir}/ctype_inline.h 	${target_srcdir}/ctype_noninline.h 	${target_srcdir}/os_defines.h 	${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h 	${glibcpp_srcdir}/@CPU_LIMITS_INC_SRCDIR@/cpu_limits.h 
+target_headers = \
+	${target_srcdir}/ctype_base.h \
+	${target_srcdir}/ctype_inline.h \
+	${target_srcdir}/ctype_noninline.h \
+	${target_srcdir}/os_defines.h \
+	${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
+	${glibcpp_srcdir}/@CPU_LIMITS_INC_SRCDIR@/cpu_limits.h 
 
 # These extra_target_headers files are all built with ad hoc naming rules.
-extra_target_headers =  	${target_builddir}/basic_file_model.h 	${target_builddir}/c++config.h 	${target_builddir}/c++io.h 	${target_builddir}/c++locale.h 	${target_builddir}/messages_members.h 	${target_builddir}/codecvt_specializations.h
+extra_target_headers = \
+	${target_builddir}/basic_file_model.h \
+	${target_builddir}/c++config.h \
+	${target_builddir}/c++io.h \
+	${target_builddir}/c++locale.h \
+	${target_builddir}/messages_members.h \
+	${target_builddir}/codecvt_specializations.h
 
 
 thread_builddir = ./${target_alias}/bits
-thread_headers =  	${thread_builddir}/gthr.h 	${thread_builddir}/gthr-single.h 	${thread_builddir}/gthr-default.h
+thread_headers = \
+	${thread_builddir}/gthr.h \
+	${thread_builddir}/gthr-single.h \
+	${thread_builddir}/gthr-default.h
 
 
 # List of all timestamp files.  By keeping only one copy of this list, both
 # CLEANFILES and all-local are kept up-to-date.
-allstamps = stamp-std stamp-bits stamp-c_base stamp-backward stamp-ext 	stamp-target stamp-thread 
+allstamps = stamp-std stamp-bits stamp-c_base stamp-backward stamp-ext \
+	stamp-target stamp-thread 
 
 
 # Target includes for threads
@@ -227,7 +453,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:

libstdc++-v3/include/bits/ostream.tcc

@@ -464,7 +464,7 @@ namespace std
       return *this;
     }
 
-  // 27.6.2.5.4 Character inserters
+  // 27.6.2.5.4 Character inserters.
   template<typename _CharT, typename _Traits>
     basic_ostream<_CharT, _Traits>&
     operator<<(basic_ostream<_CharT, _Traits>& __out, _CharT __c)
@@ -499,7 +499,7 @@ namespace std
       return __out;
     }
   
-  // Specialization
+  // Specializations.
   template <class _Traits> 
     basic_ostream<char, _Traits>&
     operator<<(basic_ostream<char, _Traits>& __out, char __c)
@@ -614,7 +614,7 @@ namespace std
       return __out;
     }
 
-  // Partial specializationss
+  // Partial specializations.
   template<class _Traits>
     basic_ostream<char, _Traits>&
     operator<<(basic_ostream<char, _Traits>& __out, const char* __s)

libstdc++-v3/testsuite/22_locale/codecvt_members_char_char.cc

@@ -82,6 +82,7 @@ void test01()
 // libstdc++/5280
 void test02()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -93,6 +94,7 @@ void test02()
       test01();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 
 int main ()

libstdc++-v3/testsuite/22_locale/codecvt_members_wchar_t_char.cc

@@ -114,6 +114,7 @@ void test01()
 // libstdc++/5280
 void test02()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -125,6 +126,7 @@ void test02()
       test01();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 #endif /* !defined(_GLIBCPP_USE_WCHAR_T) */
 

libstdc++-v3/testsuite/22_locale/collate_members_char.cc

@@ -132,6 +132,7 @@ void test01()
 // libstdc++/5280
 void test02()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -143,6 +144,7 @@ void test02()
       test01();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 
 int main()

libstdc++-v3/testsuite/22_locale/collate_members_wchar_t.cc

@@ -132,6 +132,7 @@ void test01()
 // libstdc++/5280
 void test02()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -143,6 +144,7 @@ void test02()
       test01();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 #endif
 

libstdc++-v3/testsuite/22_locale/ctype_members_char.cc

@@ -246,6 +246,7 @@ public:
 // libstdc++/5280
 void test03()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -258,6 +259,7 @@ void test03()
       test02();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 
 int main() 

libstdc++-v3/testsuite/22_locale/ctype_members_wchar_t.cc

@@ -100,6 +100,7 @@ void test01()
 // libstdc++/5280
 void test03()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -111,6 +112,7 @@ void test03()
       test01();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 #endif /* !defined(_GLIBCPP_USE_WCHAR_T) */
 

libstdc++-v3/testsuite/22_locale/messages_members_char.cc

@@ -84,6 +84,7 @@ void test01()
 // libstdc++/5280
 void test02()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -95,6 +96,7 @@ void test02()
       test01();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 
 int main()

libstdc++-v3/testsuite/22_locale/money_get_members_char.cc

@@ -292,6 +292,7 @@ void test03()
 // libstdc++/5280
 void test04()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -305,6 +306,7 @@ void test04()
       test03();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 
 int main()

libstdc++-v3/testsuite/22_locale/money_get_members_wchar_t.cc

@@ -294,6 +294,7 @@ void test03()
 // libstdc++/5280
 void test04()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -307,6 +308,7 @@ void test04()
       test03();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 #endif
 

libstdc++-v3/testsuite/22_locale/money_put_members_char.cc

@@ -286,6 +286,7 @@ void test03()
 // libstdc++/5280
 void test04()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -299,6 +300,7 @@ void test04()
       test03();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 
 int main()

libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc

@@ -286,6 +286,7 @@ void test03()
 // libstdc++/5280
 void test04()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -299,6 +300,7 @@ void test04()
       test03();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 #endif
 

libstdc++-v3/testsuite/22_locale/moneypunct_members_char.cc

@@ -108,6 +108,7 @@ void test01()
 // libstdc++/5280
 void test02()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -119,6 +120,7 @@ void test02()
       test01();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 
 int main()

libstdc++-v3/testsuite/22_locale/moneypunct_members_wchar_t.cc

@@ -109,6 +109,7 @@ void test01()
 // libstdc++/5280
 void test02()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -120,6 +121,7 @@ void test02()
       test01();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 #endif
 

libstdc++-v3/testsuite/22_locale/num_get_members_char.cc

@@ -316,6 +316,7 @@ void test02()
 // libstdc++/5280
 void test03()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -328,6 +329,7 @@ void test03()
       test02();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 
 int main()

libstdc++-v3/testsuite/22_locale/num_get_members_wchar_t.cc

@@ -318,6 +318,7 @@ void test02()
 // libstdc++/5280
 void test03()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -330,6 +331,7 @@ void test03()
       test02();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 #endif
 

libstdc++-v3/testsuite/22_locale/num_put_members_char.cc

@@ -294,6 +294,7 @@ void test02()
 // libstdc++/5280
 void test03()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -306,6 +307,7 @@ void test03()
       test02();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 
 int main()

libstdc++-v3/testsuite/22_locale/num_put_members_wchar_t.cc

@@ -294,6 +294,7 @@ void test02()
 // libstdc++/5280
 void test03()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -306,6 +307,7 @@ void test03()
       test02();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 #endif
 

libstdc++-v3/testsuite/22_locale/numpunct_members_char.cc

@@ -86,6 +86,7 @@ void test01()
 // libstdc++/5280
 void test02()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -97,6 +98,7 @@ void test02()
       test01();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 
 int main()

libstdc++-v3/testsuite/22_locale/numpunct_members_wchar_t.cc

@@ -84,6 +84,7 @@ void test01()
 // libstdc++/5280
 void test02()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -95,6 +96,7 @@ void test02()
       test01();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 #endif
 

libstdc++-v3/testsuite/22_locale/time_get_members_char.cc

@@ -679,6 +679,7 @@ void test06()
 // libstdc++/5280
 void test07()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -695,6 +696,7 @@ void test07()
       test06();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 
 int main()

libstdc++-v3/testsuite/22_locale/time_get_members_wchar_t.cc

@@ -679,6 +679,7 @@ void test06()
 // libstdc++/5280
 void test07()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -695,6 +696,7 @@ void test07()
       test06();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 #endif
 

libstdc++-v3/testsuite/22_locale/time_put_members_char.cc

@@ -234,6 +234,7 @@ void test02()
 // libstdc++/5280
 void test03()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -246,6 +247,7 @@ void test03()
       test02();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 
 int main()

libstdc++-v3/testsuite/22_locale/time_put_members_wchar_t.cc

@@ -236,6 +236,7 @@ void test02()
 // libstdc++/5280
 void test03()
 {
+#ifdef _GLIBCPP_HAVE_SETENV 
   // Set the global locale to non-"C".
   std::locale loc_de("de_DE");
   std::locale::global(loc_de);
@@ -248,6 +249,7 @@ void test03()
       test02();
       setenv("LANG", oldLANG, 1);
     }
+#endif
 }
 #endif