Makefile.am (tmp-libstdsc++.INC:): Do not use -I$(top_builddir).

2000-11-12  Alexandre Petit-Bianco  <apbianco@cygnus.com>

        * Makefile.am (tmp-libstdsc++.INC:): Do not use -I$(top_builddir).
        * Makefile.in: Regenerate.

From-SVN: r37442

libstdc++-v3/ChangeLog

+2000-11-12  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+        * Makefile.am (tmp-libstdsc++.INC:): Do not use -I$(top_builddir).
+        * Makefile.in: Regenerate.
+
 2000-11-12  David Edelsohn  <edelsohn@gnu.org>
 
         * acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Add test for

libstdc++-v3/aclocal.m4

@@ -1095,6 +1095,12 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
       dnl X/Open Portability Guide, version 2 features (XPG2).
       AC_CHECK_HEADER(iconv.h, ac_has_iconv_h=yes, ac_has_iconv_h=no)
       AC_CHECK_HEADER(langinfo.h, ac_has_langinfo_h=yes, ac_has_langinfo_h=no)
+
+      dnl Check for existence of libiconv.a providing XPG2 wchar_t support.
+      AC_CHECK_LIB(iconv, iconv, libiconv="-liconv")
+      ac_save_LIBS="$LIBS"
+      LIBS="$LIBS $libiconv"
+
       AC_CHECK_FUNCS(iconv_open iconv_close iconv nl_langinfo, \
       ac_XPG2funcs=yes, ac_XPG2funcs=no)
   

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.45 2000/10/29 22:30:27 bkoz Exp $
+## $Id: Makefile.am,v 1.46 2000/11/13 21:04:54 bkoz Exp $
 
 AUTOMAKE_OPTIONS = 1.3 gnits
 MAINT_CHARSET = latin1
@@ -295,7 +295,7 @@ libstdc++.INC: Makefile
 	mv tmp-$@ $@
 
 tmp-libstdc++.INC: Makefile
-	echo -I$(top_builddir) $(INCLUDES) > $@
+	echo $(INCLUDES) > $@
 
 
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be

libstdc++-v3/src/Makefile.in

@@ -558,7 +558,7 @@ libstdc++.INC: Makefile
 	mv tmp-$@ $@
 
 tmp-libstdc++.INC: Makefile
-	echo -I$(top_builddir) $(INCLUDES) > $@
+	echo $(INCLUDES) > $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.