Makefile.am (LIBIO_INCLUDES): Set to -I$(top_srcdir)/libio even if GLIBCPP_NEED_LIBIO is false.

2000-07-24  H.J. Lu  <hjl@gnu.org>

        * src/Makefile.am (LIBIO_INCLUDES): Set to -I$(top_srcdir)/libio
        even if GLIBCPP_NEED_LIBIO is false. The installed glibc header
        files don't include private libio header files needed by
        libstdc++ v3.
        * src/Makefile.in: Rebuild.

From-SVN: r35261

libstdc++-v3/src/Makefile.am

@@ -64,7 +64,7 @@ if GLIBCPP_NEED_LIBIO
 LIBIO_INCLUDES = \
 	-I$(top_builddir)/libio -I$(top_srcdir)/libio 
 else
-LIBIO_INCLUDES = 
+LIBIO_INCLUDES = -I$(top_srcdir)/libio
 endif
 
 if GLIBCPP_USE_CSHADOW
@@ -98,7 +98,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) \
 # 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 impossible.
-CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --mode=link "$(CC)" -Wl,-O1 @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
 
 
 headers = \

libstdc++-v3/src/Makefile.in

@@ -137,7 +137,7 @@ AM_CXXFLAGS = \
 TOPLEVEL_INCLUDES = -I$(includedir)
 @GLIBCPP_NEED_LIBIO_TRUE@LIBIO_INCLUDES = @GLIBCPP_NEED_LIBIO_TRUE@\
 @GLIBCPP_NEED_LIBIO_TRUE@	-I$(top_builddir)/libio -I$(top_srcdir)/libio 
-@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_INCLUDES = 
+@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_INCLUDES = @GLIBCPP_NEED_LIBIO_FALSE@-I$(top_srcdir)/libio
 #CSHADOW_INCLUDES = \
 #	@CSHADOWFLAGS@ -I$(top_srcdir)/shadow -I$(top_builddir)/cshadow
 @GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_INCLUDES = 
@@ -169,7 +169,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) \
 # 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 impossible.
-CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --mode=link "$(CC)" -Wl,-O1 @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
 
 headers = \
 	bits/cpp_type_traits.h \