stl_config.h: Remove file.

2001-02-20 Phil Edwards <pme@sources.redhat.com> * include/bits/stl_config.h: Remove file. * src/Makefile.am (base_headers): Remove from list. * configure: Regenerate. * Makefile.in: Ditto. * libio/Makefile.in: Ditto. * libmath/Makefile.in: Ditto. * libsupc++/Makefile.in: Ditto. * src/Makefile.in: Ditto. * include/bits/c++config: Move relevant macros to here. * include/backward/alloc.h: Include c++config.h instead. * include/backward/function.h: Ditto. * include/backward/heap.h: Ditto. * include/backward/pair.h: Ditto. * include/bits/pthread_allocimpl.h: Ditto. * include/bits/std_functional.h: Ditto. * include/bits/std_iterator.h: Ditto. * include/bits/std_numeric.h: Ditto. * include/bits/std_utility.h: Ditto. * include/bits/stl_algobase.h: Ditto. * include/bits/type_traits.h: Ditto. * src/stl-inst.cc: Ditto. From-SVN: r39931

stl_config.h: Remove file.
2001-02-20 Phil Edwards <pme@sources.redhat.com> * include/bits/stl_config.h: Remove file. * src/Makefile.am (base_headers): Remove from list. * configure: Regenerate. * Makefile.in: Ditto. * libio/Makefile.in: Ditto. * libmath/Makefile.in: Ditto. * libsupc++/Makefile.in: Ditto. * src/Makefile.in: Ditto. * include/bits/c++config: Move relevant macros to here. * include/backward/alloc.h: Include c++config.h instead. * include/backward/function.h: Ditto. * include/backward/heap.h: Ditto. * include/backward/pair.h: Ditto. * include/bits/pthread_allocimpl.h: Ditto. * include/bits/std_functional.h: Ditto. * include/bits/std_iterator.h: Ditto. * include/bits/std_numeric.h: Ditto. * include/bits/std_utility.h: Ditto. * include/bits/stl_algobase.h: Ditto. * include/bits/type_traits.h: Ditto. * src/stl-inst.cc: Ditto. From-SVN: r39931
9cfeea6e · Phil Edwards · 288edf47 · 9cfeea6e · 9cfeea6e · 9cfeea6e
Commit 9cfeea6e authored Feb 20, 2001 by Phil Edwards
22 changed files
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
+2001-02-20  Phil Edwards  <pme@sources.redhat.com>
+
+	* include/bits/stl_config.h:  Remove file.
+	* src/Makefile.am (base_headers):  Remove from list.
+	* configure:  Regenerate.
+	* Makefile.in:  Ditto.
+	* libio/Makefile.in:  Ditto.
+	* libmath/Makefile.in:  Ditto.
+	* libsupc++/Makefile.in:  Ditto.
+	* src/Makefile.in:  Ditto.
+
+	* include/bits/c++config:  Move relevant macros to here.
+	* include/backward/alloc.h:  Include c++config.h instead.
+	* include/backward/function.h:  Ditto.
+	* include/backward/heap.h:  Ditto.
+	* include/backward/pair.h:  Ditto.
+	* include/bits/pthread_allocimpl.h:  Ditto.
+	* include/bits/std_functional.h:  Ditto.
+	* include/bits/std_iterator.h:  Ditto.
+	* include/bits/std_numeric.h:  Ditto.
+	* include/bits/std_utility.h:  Ditto.
+	* include/bits/stl_algobase.h:  Ditto.
+	* include/bits/type_traits.h:  Ditto.
+	* src/stl-inst.cc:  Ditto.
+
 2001-02-19  Gabriel Dos Reis  <gdr@merlin.codesourcery.com>

 	* include/bits/basic_file.h: Add #pragma system_header

--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -138,7 +138,48 @@ MULTICLEAN = true
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
 # values defined in terms of make variables, as is the case for CC and
 # friends when we are called from the top level Makefile.
-AM_MAKEFLAGS =  	"AR_FLAGS=$(AR_FLAGS)" 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" 	"CC_FOR_TARGET=$(CC_FOR_TARGET)" 	"CFLAGS=$(CFLAGS)" 	"CXXFLAGS=$(CXXFLAGS)" 	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" 	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" 	"INSTALL=$(INSTALL)" 	"INSTALL_DATA=$(INSTALL_DATA)" 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" 	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" 	"LDFLAGS=$(LDFLAGS)" 	"LIBCFLAGS=$(LIBCFLAGS)" 	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" 	"MAKE=$(MAKE)" 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 	"PICFLAG=$(PICFLAG)" 	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" 	"SHELL=$(SHELL)" 	"EXPECT=$(EXPECT)" 	"RUNTEST=$(RUNTEST)" 	"RUNTESTFLAGS=$(RUNTESTFLAGS)" 	"exec_prefix=$(exec_prefix)" 	"infodir=$(infodir)" 	"libdir=$(libdir)" 	"includedir=$(includedir)" 	"prefix=$(prefix)" 	"tooldir=$(tooldir)" 	"AR=$(AR)" 	"AS=$(AS)" 	"CC=$(CC)" 	"CXX=$(CXX)" 	"LD=$(LD)" 	"LIBCFLAGS=$(LIBCFLAGS)" 	"PICFLAG=$(PICFLAG)" 	"RANLIB=$(RANLIB)" 	"NM=$(NM)" 	"NM_FOR_BUILD=$(NM_FOR_BUILD)" 	"NM_FOR_TARGET=$(NM_FOR_TARGET)" 	"DESTDIR=$(DESTDIR)" 	"WERROR=$(WERROR)" 
+AM_MAKEFLAGS = \
+	"AR_FLAGS=$(AR_FLAGS)" \
+	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
+	"CFLAGS=$(CFLAGS)" \
+	"CXXFLAGS=$(CXXFLAGS)" \
+	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+	"INSTALL=$(INSTALL)" \
+	"INSTALL_DATA=$(INSTALL_DATA)" \
+	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
+	"LDFLAGS=$(LDFLAGS)" \
+	"LIBCFLAGS=$(LIBCFLAGS)" \
+	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
+	"MAKE=$(MAKE)" \
+	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+	"PICFLAG=$(PICFLAG)" \
+	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
+	"SHELL=$(SHELL)" \
+	"EXPECT=$(EXPECT)" \
+	"RUNTEST=$(RUNTEST)" \
+	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+	"exec_prefix=$(exec_prefix)" \
+	"infodir=$(infodir)" \
+	"libdir=$(libdir)" \
+	"includedir=$(includedir)" \
+	"prefix=$(prefix)" \
+	"tooldir=$(tooldir)" \
+	"AR=$(AR)" \
+	"AS=$(AS)" \
+	"CC=$(CC)" \
+	"CXX=$(CXX)" \
+	"LD=$(LD)" \
+	"LIBCFLAGS=$(LIBCFLAGS)" \
+	"PICFLAG=$(PICFLAG)" \
+	"RANLIB=$(RANLIB)" \
+	"NM=$(NM)" \
+	"NM_FOR_BUILD=$(NM_FOR_BUILD)" \
+	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
+	"DESTDIR=$(DESTDIR)" \
+	"WERROR=$(WERROR)" 

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 CONFIG_HEADER = config.h

--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
--- a/libstdc++-v3/include/backward/alloc.h
+++ b/libstdc++-v3/include/backward/alloc.h
@@ -14,9 +14,7 @@
 #ifndef _CPP_BACKWARD_ALLOC_H
 #define _CPP_BACKWARD_ALLOC_H 1

-#ifndef _CPP_BITS_STL_CONFIG_H
-#include <bits/stl_config.h>
-#endif
+#include <bits/c++config.h>
 #ifndef _CPP_BITS_STL_ALLOC_H
 #include <bits/stl_alloc.h>
 #endif

--- a/libstdc++-v3/include/backward/function.h
+++ b/libstdc++-v3/include/backward/function.h
@@ -27,9 +27,7 @@
 #ifndef _CPP_BACKWARD_FUNCTION_H
 #define _CPP_BACKWARD_FUNCTION_H 1

-#ifndef _CPP_BITS_STL_CONFIG_H
-#include <bits/stl_config.h>
-#endif
+#include <bits/c++config.h>
 #include <stddef.h>
 #ifndef _CPP_BITS_STL_FUNCTION_H
 #include <bits/stl_function.h>

--- a/libstdc++-v3/include/backward/heap.h
+++ b/libstdc++-v3/include/backward/heap.h
@@ -26,7 +26,7 @@
 #ifndef _CPP_BACKWARD_HEAP_H
 #define _CPP_BACKWARD_HEAP_H 1

-#include <bits/stl_config.h>
+#include <bits/c++config.h>
 #include <bits/stl_heap.h>

 #ifdef __STL_USE_NAMESPACES

--- a/libstdc++-v3/include/backward/pair.h
+++ b/libstdc++-v3/include/backward/pair.h
@@ -27,9 +27,7 @@
 #ifndef _CPP_BACKWARD_PAIR_H
 #define _CPP_BACKWARD_PAIR_H 1

-#ifndef _CPP_BITS_STL_CONFIG_H
-#include <bits/stl_config.h>
-#endif
+#include <bits/c++config.h>
 #ifndef _CPP_BITS_STL_PAIR_H
 #include <bits/stl_pair.h>
 #endif

--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -56,12 +56,117 @@
 # define _GLIBCPP_RESOLVE_LIB_DEFECTS 1


-
-
-
-
-
-
-
+// From SGI's stl_config.h; generic settings and user hooks (_NOTHREADS).
+#if defined(_PTHREADS) && !defined(_NOTHREADS)
+#    define __STL_PTHREADS
+#endif
+#if defined(_UITHREADS) && !defined(_PTHREADS) && !defined(_NOTHREADS)
+#    define __STL_UITHREADS
+#endif
+
+// Also from SGI's stl_config.h; settings for GCC.
+#define __STL_HAS_WCHAR_T
+#define __STL_MEMBER_TEMPLATES
+#define __STL_MEMBER_TEMPLATE_CLASSES
+#define __STL_TEMPLATE_FRIENDS
+#define __STL_CLASS_PARTIAL_SPECIALIZATION 
+#define __STL_PARTIAL_SPECIALIZATION_SYNTAX 
+#define __STL_FUNCTION_TMPL_PARTIAL_ORDER
+#define __STL_EXPLICIT_FUNCTION_TMPL_ARGS
+#define __SGI_STL_USE_AUTO_PTR_CONVERSIONS
+#define __STL_HAS_NAMESPACES
+#define __STL_USE_NAMESPACES
+#ifdef __EXCEPTIONS
+#  define __STL_USE_EXCEPTIONS
+#  define __STL_TRY try
+#  define __STL_CATCH_ALL catch(...)
+#  define __STL_THROW(x) throw x
+#  define __STL_RETHROW throw
+#  define __STL_NOTHROW throw()
+#  define __STL_UNWIND(action) catch(...) { action; throw; }
+#else
+#  define __STL_TRY 
+#  define __STL_CATCH_ALL if (false)
+#  define __STL_THROW(x) 
+#  define __STL_RETHROW 
+#  define __STL_NOTHROW 
+#  define __STL_UNWIND(action) 
+#endif
+#define __STL_THROW_RANGE_ERRORS 
+#define __STL_CAN_THROW_RANGE_ERRORS 
+#define __STL_USE_STD_ALLOCATORS 
+#define __USE_MALLOC // As the "underlying allocator"
+//#define __STL_USE_NEW_IOSTREAMS //990209 bkoz--use standard .h includes.
+#ifdef _REENTRANT
+#  define __STL_THREADS
+#endif
+#ifdef _PTHREADS
+#  define __STL_PTHREADS
+#endif
+#ifndef __STRICT_ANSI__
+#  define __STL_LONG_LONG
+#endif
+//#if (__GNUC__ < 2) || (__GNUC__ == 2 && __GNUC_MINOR__ < 95)
+#  define __STL_NO_FUNCTION_PTR_IN_CLASS_TEMPLATE
+//#endif
+
+// Also from SGI's stl_config.h; settings for GCC.
+// Mingw32, GCC compiler using the Microsoft C runtime
+#if defined(__MINGW32__)
+#  define __STL_NO_DRAND48
+#  ifdef _MT
+#    define __STL_WIN32THREADS
+#  endif
+#endif
+
+// Cygwin32, GCC compiler on MS Windows
+#if defined(__CYGWIN__)
+#  define __STL_NO_DRAND48
+#endif
+
+// The old stl_config.h would use the above settings in chains of
+// if/then/else tests to define the following.
+#define __STL_DEPENDENT_DEFAULT_TMPL(_Tp) = _Tp
+#define __STL_TEMPLATE
+#define __STL_NULL_TMPL_ARGS <>
+#define __STL_TEMPLATE_NULL template<>
+#define __STL_DEFAULT_ALLOCATOR(T) allocator< T >
+
+#define __STL_USE_NAMESPACES
+#define __STD std
+#define __STL_BEGIN_NAMESPACE namespace std {
+#define __STL_END_NAMESPACE }
+#define __STL_USE_NAMESPACE_FOR_RELOPS
+#define __STL_BEGIN_RELOPS_NAMESPACE namespace std { namespace rel_ops {
+#define __STL_END_RELOPS_NAMESPACE } }
+#define __STD_RELOPS std::rel_ops
+#define __STD_QUALIFIER std::
+
+
+#ifdef __STL_ASSERTIONS
+# include <stdio.h>
+# define __stl_assert(expr) \
+    if (!(expr)) { fprintf(stderr, "%s:%d STL assertion failure: %s\n", \
+                          __FILE__, __LINE__, # expr); abort(); }
+#else
+# define __stl_assert(expr)
+#endif
+
+#if defined(__STL_WIN32THREADS) || defined(__STL_SGI_THREADS) \
+    || defined(__STL_PTHREADS)  || defined(__STL_UITHREADS)
+#   define __STL_THREADS
+#   define __STL_VOLATILE volatile
+#else
+#   define __STL_VOLATILE
+#endif
+
+#if defined(__STL_CLASS_PARTIAL_SPECIALIZATION) \
+    && defined(__STL_MEMBER_TEMPLATES) \
+    && !defined(_STL_NO_CONCEPT_CHECKS)
+#  define __STL_USE_CONCEPT_CHECKS
+#endif
+
+
+// End of prewritten config; the discovered settings follow.


--- a/libstdc++-v3/include/bits/pthread_allocimpl.h
+++ b/libstdc++-v3/include/bits/pthread_allocimpl.h
@@ -27,8 +27,8 @@
 // cache lines among processors, with potentially serious performance
 // consequences.

+#include <bits/c++config.h>
 #include <bits/std_cerrno.h>
-#include <bits/stl_config.h>
 #include <bits/stl_alloc.h>
 #ifndef __RESTRICT
 #  define __RESTRICT

--- a/libstdc++-v3/include/bits/std_functional.h
+++ b/libstdc++-v3/include/bits/std_functional.h
@@ -16,8 +16,7 @@
 #define _CPP_FUNCTIONAL 1

 #pragma GCC system_header
-
-#include <bits/stl_config.h>
+#include <bits/c++config.h>
 #include <bits/std_cstddef.h>
 #include <bits/stl_function.h>


--- a/libstdc++-v3/include/bits/std_iterator.h
+++ b/libstdc++-v3/include/bits/std_iterator.h
@@ -28,8 +28,7 @@
 #define _CPP_ITERATOR 1

 #pragma GCC system_header
-
-#include <bits/stl_config.h>
+#include <bits/c++config.h>
 #include <bits/std_cstddef.h>
 #include <bits/std_iosfwd.h>
 #include <bits/stl_iterator_base.h>

--- a/libstdc++-v3/include/bits/std_numeric.h
+++ b/libstdc++-v3/include/bits/std_numeric.h
@@ -28,8 +28,7 @@
 #define _CPP_NUMERIC 1

 #pragma GCC system_header
-
-#include <bits/stl_config.h>
+#include <bits/c++config.h>
 #include <bits/std_cstddef.h>
 #include <bits/std_iterator.h>
 #include <bits/stl_function.h>

--- a/libstdc++-v3/include/bits/std_utility.h
+++ b/libstdc++-v3/include/bits/std_utility.h
@@ -28,8 +28,7 @@
 #define _CPP_UTILITY 1

 #pragma GCC system_header
-
-#include <bits/stl_config.h>
+#include <bits/c++config.h>
 #include <bits/stl_relops.h>
 #include <bits/stl_pair.h>


--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -32,7 +32,7 @@
 #ifndef __SGI_STL_INTERNAL_ALGOBASE_H
 #define __SGI_STL_INTERNAL_ALGOBASE_H

-#include <bits/stl_config.h>
+#include <bits/c++config.h>
 #ifndef __SGI_STL_INTERNAL_PAIR_H
 #include <bits/stl_pair.h>
 #endif

--- a/libstdc++-v3/include/bits/stl_config.h
+++ b/libstdc++-v3/include/bits/stl_config.h
--- a/libstdc++-v3/include/bits/type_traits.h
+++ b/libstdc++-v3/include/bits/type_traits.h
@@ -17,9 +17,7 @@

 #pragma GCC system_header

-#ifndef _CPP_BITS_STL_CONFIG_H
-#include <bits/stl_config.h>
-#endif
+#include <bits/c++config.h>

 /*
 This header file provides a framework for allowing compile time dispatch

--- a/libstdc++-v3/libio/Makefile.in
+++ b/libstdc++-v3/libio/Makefile.in
@@ -114,7 +114,7 @@ toplevel_srcdir = @toplevel_srcdir@
 AUTOMAKE_OPTIONS = 1.3 cygnus

 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
-@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = libio.la
+@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = @GLIBCPP_BUILD_LIBIO_TRUE@libio.la
 @GLIBCPP_BUILD_LIBIO_FALSE@noinst_LTLIBRARIES = 

 # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
@@ -126,14 +126,21 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 LIBIO_INCLUDES = @LIBIO_INCLUDES@
 CSHADOW_INCLUDES = @CSHADOW_INCLUDES@

-INCLUDES =  	-nostdinc++ 	-I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) 	$(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)	
+INCLUDES = \
+	-nostdinc++ \
+	-I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) \
+	$(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)	


-libio_headers =          libio.h libioP.h iolibio.h
+libio_headers = \
+        libio.h libioP.h iolibio.h

-@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = 	filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c 	iofclose.c iofopen.c 
+@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = @GLIBCPP_NEED_LIBIO_TRUE@\
+@GLIBCPP_NEED_LIBIO_TRUE@	filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c \
+@GLIBCPP_NEED_LIBIO_TRUE@	iofclose.c iofopen.c 
 @GLIBCPP_NEED_LIBIO_FALSE@LIBIO_SRCS = 
-@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = 	wfiledoalloc.c wfileops.c wgenops.c iofwide.c
+@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = @GLIBCPP_NEED_WLIBIO_TRUE@\
+@GLIBCPP_NEED_WLIBIO_TRUE@	wfiledoalloc.c wfileops.c wgenops.c iofwide.c
 @GLIBCPP_NEED_WLIBIO_FALSE@LIBIO_WSRCS = 

 EXTRA_DIST = iostreamP.h

--- a/libstdc++-v3/libmath/Makefile.in
+++ b/libstdc++-v3/libmath/Makefile.in
@@ -117,18 +117,24 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs

 noinst_LTLIBRARIES = libmath.la

-EXTRA_LONG_DOUBLE_yes =  	hypotl.c signbitl.c
+EXTRA_LONG_DOUBLE_yes = \
+	hypotl.c signbitl.c


-EXTRA_DIST =  	hypot.c hypotf.c atan2f.c expf.c 	$(EXTRA_LONG_DOUBLE_yes) 
+EXTRA_DIST = \
+	hypot.c hypotf.c atan2f.c expf.c \
+	$(EXTRA_LONG_DOUBLE_yes) 


-libmath_la_LIBADD =  	@LIBMATHOBJS@ 	$(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE)) 
+libmath_la_LIBADD = \
+	@LIBMATHOBJS@ \
+	$(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE)) 


 libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)

-libmath_la_SOURCES =  	signbit.c signbitf.c
+libmath_la_SOURCES = \
+	signbit.c signbitf.c


 LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@@ -142,7 +148,9 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 LIBIO_INCLUDES = @LIBIO_INCLUDES@
 CSHADOW_INCLUDES = @CSHADOW_INCLUDES@

-INCLUDES =  	-I$(GLIBCPP_INCLUDE_DIR) -I$(top_builddir)/include  	$(TOPLEVEL_INCLUDES) 
+INCLUDES = \
+	-I$(GLIBCPP_INCLUDE_DIR) -I$(top_builddir)/include  \
+	$(TOPLEVEL_INCLUDES) 

 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 

--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -131,11 +131,13 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
 # These bits are all figured out from configure. Look in acinclude.m4
 # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
 # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
-CONFIG_CXXFLAGS =  	@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@ 
+CONFIG_CXXFLAGS = \
+	@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@ 


 # Warning flags to use.
-WARN_CXXFLAGS =  	@WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
+WARN_CXXFLAGS = \
+	@WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@


 # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
@@ -147,13 +149,31 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 LIBIO_INCLUDES = @LIBIO_INCLUDES@
 TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@

-INCLUDES =  	-I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include 	-I$(GLIBCPP_INCLUDE_DIR) $(CSTD_INCLUDES) -I$(top_builddir)/include 	 $(LIBSUPCXX_INCLUDES)
+INCLUDES = \
+	-I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include \
+	-I$(GLIBCPP_INCLUDE_DIR) $(CSTD_INCLUDES) -I$(top_builddir)/include \
+	 $(LIBSUPCXX_INCLUDES)


-headers =  	exception new typeinfo cxxabi.h exception_defines.h 
+headers = \
+	exception new typeinfo cxxabi.h exception_defines.h 


-sources =  	del_op.cc 	del_opnt.cc 	del_opv.cc 	del_opvnt.cc 	exception_support.cc 	new_handler.cc 	new_op.cc 	new_opnt.cc 	new_opv.cc 	new_opvnt.cc 	pure.cc 	tinfo.cc 	tinfo2.cc 	vec.cc
+sources = \
+	del_op.cc \
+	del_opnt.cc \
+	del_opv.cc \
+	del_opvnt.cc \
+	exception_support.cc \
+	new_handler.cc \
+	new_op.cc \
+	new_opnt.cc \
+	new_opv.cc \
+	new_opvnt.cc \
+	pure.cc \
+	tinfo.cc \
+	tinfo2.cc \
+	vec.cc


 libsupc___la_SOURCES = $(sources)
@@ -171,7 +191,12 @@ LIBSUPCXX_CXXFLAGS = -prefer-pic
 # set this option because CONFIG_CXXFLAGS has to be after
 # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
 # as the occasion call for it. (ie, --enable-debug)
-AM_CXXFLAGS =  	-fno-implicit-templates 	$(LIBSUPCXX_CXXFLAGS) 	$(WARN_CXXFLAGS) 	$(OPTIMIZE_CXXFLAGS) 	$(CONFIG_CXXFLAGS) 
+AM_CXXFLAGS = \
+	-fno-implicit-templates \
+	$(LIBSUPCXX_CXXFLAGS) \
+	$(WARN_CXXFLAGS) \
+	$(OPTIMIZE_CXXFLAGS) \
+	$(CONFIG_CXXFLAGS) 


 # libstdc++ libtool notes
@@ -195,14 +220,17 @@ AM_CXXFLAGS =  	-fno-implicit-templates 	$(LIBSUPCXX_CXXFLAGS) 	$(WARN_CXXFLAGS)
 #
 # We have to put --tag disable-shared after --tag CXX lest things
 # CXX undo the affect of disable-shared.
-LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared                --mode=compile $(CXX) $(INCLUDES) 	       $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) 
+LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
+               --mode=compile $(CXX) $(INCLUDES) \
+	       $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) 


 # 3) We have a problem when building the shared libstdc++ object if
 # the rules automake generates would be used.  We cannot allow CXX to
 # be used in libtool since this would add -lstdc++ to the link line
 # which of course is problematic at this point.
-CXXLINK = $(LIBTOOL) --mode=link "$(CC)" 	  @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --mode=link "$(CC)" \
+	  @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@

 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 

--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -21,7 +21,7 @@
 ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ## USA.

-## $Id: Makefile.am,v 1.71 2001/02/07 20:26:24 bkoz Exp $
+## $Id: Makefile.am,v 1.72 2001/02/16 00:43:41 bkoz Exp $

 AUTOMAKE_OPTIONS = 1.3 gnits
 MAINT_CHARSET = latin1
@@ -98,7 +98,7 @@ base_headers = \
 	bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h \
 	bits/type_traits.h bits/std_algorithm.h \
 	bits/concept_checks.h bits/container_concepts.h \
-	bits/sequence_concepts.h bits/stl_config.h bits/stl_construct.h
+	bits/sequence_concepts.h bits/stl_construct.h

 backward_headers = \
 	backward/complex.h backward/iomanip.h backward/istream.h \

--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
--- a/libstdc++-v3/src/stl-inst.cc
+++ b/libstdc++-v3/src/stl-inst.cc
@@ -32,7 +32,6 @@
 //

 #include <bits/c++config.h>
-#include <bits/stl_config.h>
 #include <bits/stl_alloc.h>
 #include <bits/std_vector.h>