[multiple changes]

2000-06-19  Raja R Harinath  <harinath@cs.umn.edu>

	* src/Makefile.am: change @WERROR@ to $(WERROR) so that this can
	be overridden on the command line for individual files.

2000-06-19  Benjamin Kosnik  <bkoz@soma.redhat.com>

	* acinclude.m4 (GLIBCPP_CHECK_MATH_SUPPORT): Can't use
	AC_LANG_CPLUSPLUS as this tries to link in libstdc++, Which we are
	building. Use -x c++ instead, which does not attempt to link
	libstdc++.

From-SVN: r34608

libstdc++-v3/ChangeLog

+2000-06-19  Raja R Harinath  <harinath@cs.umn.edu>
+	
+	* src/Makefile.am: change @WERROR@ to $(WERROR) so that this can
+	be overridden on the command line for individual files.
+
 2000-06-19  Benjamin Kosnik  <bkoz@soma.redhat.com>
 
+	* acinclude.m4 (GLIBCPP_CHECK_MATH_SUPPORT): Can't use
+	AC_LANG_CPLUSPLUS as this tries to link in libstdc++, Which we are
+	building. Use -x c++ instead, which does not attempt to link
+	libstdc++.
+
+	* acinclude.m4 (GLIBCPP_CHECK_LINKER_FEATURES): Actually check for
+	not coring when we hit a try/throw block, which was the problem
+	with the linker support...
+
 	* docs/17_intro/contribute.html: Add bits about getting to the LWG
 	issues pages.
 	* docs/documentation.html: Rename link to make more accurate and scary.

libstdc++-v3/acinclude.m4

@@ -264,7 +264,12 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
   # Check for -Wl,--gc-sections
   AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections])
   CXXFLAGS='-Wl,--gc-sections'
-  AC_TRY_COMPILE(, [int foo;
+  AC_TRY_COMPILE(, [
+   try
+     {
+       throw 1;
+     }
+   catch (...) {};
   ], [ac_sectionLDflags=yes], [ac_sectionLFflags=no])
   if test "$ac_test_CXXFLAGS" = set; then
     CXXFLAGS="$ac_save_CXXFLAGS"
@@ -895,9 +900,16 @@ dnl Define HAVE_CARGF etc if "cargf" is found.
 dnl
 dnl GLIBCPP_CHECK_MATH_SUPPORT
 AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
 
+  dnl NB: Can't use AC_LANG_CPLUSPLUS here, because g++ tries to link
+  dnl in libstdc++, which we are building right now.
+  dnl Yet, we need to use the c++ compiler so that __cplusplus is defined.
+  dnl So, use this.
+  ac_test_CFLAGS="${CFLAGS+set}"
+  ac_save_CFLAGS="$CFLAGS"
+  CFLAGS='-x c++'
+
+  dnl Check libm
   AC_CHECK_LIB(m, sin, libm="-lm")
   save_LIBS="$LIBS"
   LIBS="$LIBS $libm"
@@ -925,7 +937,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
   _sincosl _finite _finitef _finitel _fqfinite _fpclass _qfpclass)
 
   LIBS="$save_LIBS"
-  AC_LANG_RESTORE
+  CFLAGS="$ac_save_CFLAGS"
 ])
 
 

libstdc++-v3/aclocal.m4

@@ -276,7 +276,12 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
   # Check for -Wl,--gc-sections
   AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections])
   CXXFLAGS='-Wl,--gc-sections'
-  AC_TRY_COMPILE(, [int foo;
+  AC_TRY_COMPILE(, [
+   try
+     {
+       throw 1;
+     }
+   catch (...) {};
   ], [ac_sectionLDflags=yes], [ac_sectionLFflags=no])
   if test "$ac_test_CXXFLAGS" = set; then
     CXXFLAGS="$ac_save_CXXFLAGS"
@@ -907,9 +912,16 @@ dnl Define HAVE_CARGF etc if "cargf" is found.
 dnl
 dnl GLIBCPP_CHECK_MATH_SUPPORT
 AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
 
+  dnl NB: can't use AC_LANG_CPLUSPLUS here, because g++ tries to link
+  dnl in libstdc++, which we are building right now.
+  dnl Yet, we need to use the c++ compiler so that __cplusplus is defined.
+  dnl So, use this.
+  ac_test_CFLAGS="${CFLAGS+set}"
+  ac_save_CFLAGS="$CFLAGS"
+  CFLAGS='-x c++'
+
+  dnl Check libm
   AC_CHECK_LIB(m, sin, libm="-lm")
   save_LIBS="$LIBS"
   LIBS="$LIBS $libm"
@@ -937,7 +949,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
   _sincosl _finite _finitef _finitel _fqfinite _fpclass _qfpclass)
 
   LIBS="$save_LIBS"
-  AC_LANG_RESTORE
+  CFLAGS="$ac_save_CFLAGS"
 ])
 
 

libstdc++-v3/src/Makefile.am

@@ -45,7 +45,7 @@ EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
 # or configure.in to see how they are set.
 # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
 AC_CXXFLAGS = \
-	@WERROR@ @WFMT_FLAGS@ @CPU_FLAGS@ @EXTRA_CXX_FLAGS@ \
+	$(WERROR) @WFMT_FLAGS@ @CPU_FLAGS@ @EXTRA_CXX_FLAGS@ \
 	@SECTION_FLAGS@ @SECTION_LDFLAGS@ @DEBUG_FLAGS@ 
 
 # Need to manually set this option because AC_CXXFLAGS has to be at

libstdc++-v3/src/Makefile.in

@@ -125,7 +125,7 @@ EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
 # or configure.in to see how they are set.
 # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
 AC_CXXFLAGS = \
-	@WERROR@ @WFMT_FLAGS@ @CPU_FLAGS@ @EXTRA_CXX_FLAGS@ \
+	$(WERROR) @WFMT_FLAGS@ @CPU_FLAGS@ @EXTRA_CXX_FLAGS@ \
 	@SECTION_FLAGS@ @SECTION_LDFLAGS@ @DEBUG_FLAGS@