diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cf0c1338ae38ddae100f8089e1f1161093843b52..edf37f109d0372a64dfd4b19cd5b0b2215b20c61 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,24 @@
+2000-06-19  Benjamin Kosnik  <bkoz@soma.redhat.com>
+
+	* 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.
+	* docs/gccrebuild.html: Edit for clarity as these are no longer
+	separate projects.
+	* docs/install.html: Add bits about binutils for
+	-ffunction-sections, -fdata-sections, -Wl,--gc-sections
+
+	* configure.in: Add call for GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT.
+	* math/Makefile.am (EXTRA_DIST): Change USE_LONG_DOUBLE to
+	USE_COMPLEX_LONG_DOUBLE.
+	* acinclude.m4 (GLIBCPP_CHECK_MATH_SUPPORT): Break into
+	GLIBCPP_CHECK_MATH_SUPPORT and GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT.
+	Works around irregularies in powerpc "C" compiler, but a good idea
+	anyway.
+
+	* acinclude.m4 (GLIBCPP_CHECK_COMPLEX_MATH_COMPILER_SUPPORT):
+	New. Merge both old compiler bug checks for complex into this.
+
 2000-06-19  Anthony Williams  <anthony@anthonyw.cjb.net>
 	
 	* testsuite/21_strings/find.cc: Empty strings can be found at all
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index 2d9a1596414f8cc603cf134dfe09fd69cdb0aeff..4d9da45353da36f433a9263d4c16ab35bb29f807 100644
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -98,7 +98,7 @@ THREADINCS = @THREADINCS@
 THREADLIBS = @THREADLIBS@
 THREADOBJS = @THREADOBJS@
 THREADSPEC = @THREADSPEC@
-USE_LONG_DOUBLE = @USE_LONG_DOUBLE@
+USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
 VERSION = @VERSION@
 WERROR = @WERROR@
 WFMT_FLAGS = @WFMT_FLAGS@
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 03488e758b17f2edd54b64239d0c9c1b5dc72db4..0135acd8794a21322f820c74daf2279f89c67b49 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -888,6 +888,73 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [
 ])
 
 
+dnl
+dnl Check to see what the underlying c library or math library is like.
+dnl
+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
+
+  AC_CHECK_LIB(m, sin, libm="-lm")
+  save_LIBS="$LIBS"
+  LIBS="$LIBS $libm"
+
+  dnl Check to see if basic C math functions have float, long double versions.
+  AC_REPLACE_MATHFUNCS(cosf fabsf sinf sqrtf)
+  AC_CHECK_FUNCS(isnan isnanf isnanl isinf isinff isinfl copysign copysignl \
+  acosf acosl asinf asinl atanf atanl atan2f atan2l ceilf ceill cosl \
+  coshf coshl expf expl fabsl floorf floorl fmodf fmodl frexpf frexpl ldexpf \
+  ldexpl logf logl log10f log10l modff modfl powf powl sinl sinhf \
+  sinhl sqrtl tanf tanl tanhf tanhl strtof strtold sincos sincosf \
+  sincosl finite finitef finitel fqfinite fpclass qfpclass)
+
+#Some runtimes have these functions with a preceding underscore. Please
+# keep this sync'd with the one above. And if you add any new symbol,
+# please add the corresponding block in the @BOTTOM@ section of
+# acconfig.h.
+
+  AC_CHECK_FUNCS(_isnan _isnanf _isnanl _isinf _isinff _isinfl _copysign \
+  _copysignl _acosf _acosl _asinf _asinl _atanf _atanl _atan2f _atan2l \
+  _ceilf _ceill _cosf _cosl _coshf _coshl _expf _expl _fabsf _fabsl \
+  _floorf _floorl _fmodf _fmodl _frexpf _frexpl _ldexpf _ldexpl _logf _logl \
+  _log10f _log10l _modff _modfl _powf _powl _sinf _sinl _sinhf _sinhl \
+  _sqrtf _sqrtl _tanf _tanl _tanhf _tanhl _strtof _strtold _sincos _sincosf \
+  _sincosl _finite _finitef _finitel _fqfinite _fpclass _qfpclass)
+
+  LIBS="$save_LIBS"
+  AC_LANG_RESTORE
+])
+
+
+dnl
+dnl Check to see if there is native support for complex 
+dnl
+dnl Don't compile bits in math/* if native support exits.
+dnl
+dnl Define USE_COMPLEX_LONG_DOUBLE etc if "cargf" is found.
+dnl
+dnl GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
+AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
+  dnl Check for complex versions of math functions of platform.
+  AC_CHECK_HEADERS([complex.h])
+  AC_REPLACE_MATHFUNCS(ccos ccosf ccosh ccoshf cexp cexpf c_log c_logf \
+  clog10 clog10f cpow cpowf csin csinf csinh csinhf csqrt csqrtf \
+  ctan ctanf ctanh ctanhf \
+  carg cargf nan hypot hypotf atan2f expf copysignf)
+
+  dnl We compile the long double complex functions only if the function 
+  dnl provides the non-complex long double functions.
+  USE_LONG_DOUBLE=no
+  AC_CHECK_FUNC(copysignl,
+  USE_LONG_DOUBLE=yes
+  AC_REPLACE_MATHFUNCS(ccoshl ccosl cexpl cpowl csinhl csinl \
+  csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l))
+  AC_SUBST(USE_COMPLEX_LONG_DOUBLE)
+])
+
 
 dnl Check to see what architecture we are compiling for. If it's
 dnl supported, use special hand-crafted routines to provide thread
@@ -1085,59 +1152,6 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
 ])
 
 
-dnl
-dnl Check to see what the underlying c library or math library is like.
-dnl
-dnl Define HAVE_CARGF etc if "cargf" is found.
-dnl
-dnl GLIBCPP_CHECK_MATH_SUPPORT
-AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
-  AC_CHECK_LIB(m, sin, libm="-lm")
-  save_LIBS="$LIBS"
-  LIBS="$LIBS $libm"
-
-  dnl Check for complex versions of math functions of platform.
-  AC_CHECK_HEADERS([complex.h])
-  AC_REPLACE_MATHFUNCS(ccos ccosf ccosh ccoshf cexp cexpf c_log c_logf \
-  clog10 clog10f cpow cpowf csin csinf csinh csinhf csqrt csqrtf \
-  ctan ctanf ctanh ctanhf \
-  carg cargf nan hypot hypotf atan2f expf copysignf)
-
-  dnl We compile the long double complex functions only if the function 
-  dnl provides the non-complex long double functions.
-  USE_LONG_DOUBLE=no
-  AC_CHECK_FUNC(copysignl,
-  USE_LONG_DOUBLE=yes
-  AC_REPLACE_MATHFUNCS(ccoshl ccosl cexpl cpowl csinhl csinl \
-  csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l))
-  AC_SUBST(USE_LONG_DOUBLE)
-
-  dnl Check to see if basic C math functions have float, long double versions.
-  AC_REPLACE_MATHFUNCS(cosf fabsf sinf sqrtf)
-  AC_CHECK_FUNCS(isnan isnanf isnanl isinf isinff isinfl copysign copysignl \
-  acosf acosl asinf asinl atanf atanl atan2f atan2l ceilf ceill cosl \
-  coshf coshl expf expl fabsl floorf floorl fmodf fmodl frexpf frexpl ldexpf \
-  ldexpl logf logl log10f log10l modff modfl powf powl sinl sinhf \
-  sinhl sqrtl tanf tanl tanhf tanhl strtof strtold sincos sincosf \
-  sincosl finite finitef finitel fqfinite fpclass qfpclass)
-
-#Some runtimes have these functions with a preceding underscore. Please
-# keep this sync'd with the one above. And if you add any new symbol,
-# please add the corresponding block in the @BOTTOM@ section of
-# acconfig.h.
-
-  AC_CHECK_FUNCS(_isnan _isnanf _isnanl _isinf _isinff _isinfl _copysign \
-  _copysignl _acosf _acosl _asinf _asinl _atanf _atanl _atan2f _atan2l \
-  _ceilf _ceill _cosf _cosl _coshf _coshl _expf _expl _fabsf _fabsl \
-  _floorf _floorl _fmodf _fmodl _frexpf _frexpl _ldexpf _ldexpl _logf _logl \
-  _log10f _log10l _modff _modfl _powf _powl _sinf _sinl _sinhf _sinhl \
-  _sqrtf _sqrtl _tanf _tanl _tanhf _tanhl _strtof _strtold _sincos _sincosf \
-  _sincosl _finite _finitef _finitel _fqfinite _fpclass _qfpclass)
-
-LIBS="$save_LIBS"
-])
-
-
 dnl
 dnl Check to see if this target can enable the wchar_t parts of libstdc++.
 dnl
@@ -1232,9 +1246,33 @@ dnl __complex__ float support.
 dnl
 dnl Define _GLIBCPP_BUGGY_FLOAT_COMPLEX if buggy.
 dnl
-dnl GLIBCPP_CHECK_COMPLEX_FLOAT_SUPPORT
-AC_DEFUN(GLIBCPP_CHECK_COMPLEX_FLOAT_SUPPORT, [
+dnl Check to see if this version of GNU C++ is afflicted by bugs in 
+dnl __complex__ support.Check for buggy __complex__ that will cause ICE in
+dnl gcc-2.95.x when using the library, unless we define the default copy
+dnl ctor in the specializations of complex<>. 
+dnl 
+dnl Define _GLIBCPP_BUGGY_COMPLEX if buggy.
+dnl GLIBCPP_CHECK_COMPLEX_MATH_COMPILER_SUPPORT
+AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_COMPILER_SUPPORT, [
   AC_REQUIRE([AC_PROG_CXX])
+
+  AC_MSG_CHECKING([for GNU C++ __complex__ support])
+  AC_CACHE_VAL(glibcpp_cv_complex, [
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+    AC_TRY_COMPILE([struct dcomplex { __complex__ double x; }; \
+		    dcomplex f(const dcomplex& x) { return dcomplex(x); }], \
+		    [ dcomplex x; f(x); ],
+      glibcpp_cv_complex=ok,
+      glibcpp_cv_complex=buggy
+    )
+    AC_LANG_RESTORE
+  ])
+  AC_MSG_RESULT($glibcpp_cv_complex)
+  if test $glibcpp_cv_complex = buggy; then
+    AC_DEFINE(_GLIBCPP_BUGGY_COMPLEX)
+  fi
+
   AC_MSG_CHECKING([for GNU C++ __complex__ float support])
   AC_CACHE_VAL(glibcpp_cv_float_complex, [
     AC_LANG_SAVE
@@ -1271,37 +1309,6 @@ EOB
 ])
 
 
-dnl
-dnl 
-dnl Check to see if this version of GNU C++ is afflicted by bugs in 
-dnl __complex__ support.Check for buggy __complex__ that will cause ICE in
-dnl gcc-2.95.x when using the library, unless we define the default copy
-dnl ctor in the specializations of complex<>. 
-dnl 
-dnl Define _GLIBCPP_BUGGY_COMPLEX if buggy.
-dnl
-dnl GLIBCPP_CHECK_COMPLEX_SUPPORT
-AC_DEFUN(GLIBCPP_CHECK_COMPLEX_SUPPORT, [
-  AC_REQUIRE([AC_PROG_CXX])
-  AC_MSG_CHECKING([for GNU C++ __complex__ support])
-  AC_CACHE_VAL(glibcpp_cv_complex, [
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    AC_TRY_COMPILE([struct dcomplex { __complex__ double x; }; \
-		    dcomplex f(const dcomplex& x) { return dcomplex(x); }], \
-		    [ dcomplex x; f(x); ],
-      glibcpp_cv_complex=ok,
-      glibcpp_cv_complex=buggy
-    )
-    AC_LANG_RESTORE
-  ])
-  AC_MSG_RESULT($glibcpp_cv_complex)
-  if test $glibcpp_cv_complex = buggy; then
-    AC_DEFINE(_GLIBCPP_BUGGY_COMPLEX)
-  fi
-])
-
-
 dnl
 dnl Check for special debugging mode; not for production use.
 dnl
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index b4842be496aa4097ae8f7dcd68477a83d2236b56..622abb0c05e2ddf601bd238126fc18871de6b1e3 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -900,6 +900,73 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [
 ])
 
 
+dnl
+dnl Check to see what the underlying c library or math library is like.
+dnl
+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
+
+  AC_CHECK_LIB(m, sin, libm="-lm")
+  save_LIBS="$LIBS"
+  LIBS="$LIBS $libm"
+
+  dnl Check to see if basic C math functions have float, long double versions.
+  AC_REPLACE_MATHFUNCS(cosf fabsf sinf sqrtf)
+  AC_CHECK_FUNCS(isnan isnanf isnanl isinf isinff isinfl copysign copysignl \
+  acosf acosl asinf asinl atanf atanl atan2f atan2l ceilf ceill cosl \
+  coshf coshl expf expl fabsl floorf floorl fmodf fmodl frexpf frexpl ldexpf \
+  ldexpl logf logl log10f log10l modff modfl powf powl sinl sinhf \
+  sinhl sqrtl tanf tanl tanhf tanhl strtof strtold sincos sincosf \
+  sincosl finite finitef finitel fqfinite fpclass qfpclass)
+
+#Some runtimes have these functions with a preceding underscore. Please
+# keep this sync'd with the one above. And if you add any new symbol,
+# please add the corresponding block in the @BOTTOM@ section of
+# acconfig.h.
+
+  AC_CHECK_FUNCS(_isnan _isnanf _isnanl _isinf _isinff _isinfl _copysign \
+  _copysignl _acosf _acosl _asinf _asinl _atanf _atanl _atan2f _atan2l \
+  _ceilf _ceill _cosf _cosl _coshf _coshl _expf _expl _fabsf _fabsl \
+  _floorf _floorl _fmodf _fmodl _frexpf _frexpl _ldexpf _ldexpl _logf _logl \
+  _log10f _log10l _modff _modfl _powf _powl _sinf _sinl _sinhf _sinhl \
+  _sqrtf _sqrtl _tanf _tanl _tanhf _tanhl _strtof _strtold _sincos _sincosf \
+  _sincosl _finite _finitef _finitel _fqfinite _fpclass _qfpclass)
+
+  LIBS="$save_LIBS"
+  AC_LANG_RESTORE
+])
+
+
+dnl
+dnl Check to see if there is native support for complex 
+dnl
+dnl Don't compile bits in math/* if native support exits.
+dnl
+dnl Define USE_COMPLEX_LONG_DOUBLE etc if "cargf" is found.
+dnl
+dnl GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
+AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
+  dnl Check for complex versions of math functions of platform.
+  AC_CHECK_HEADERS([complex.h])
+  AC_REPLACE_MATHFUNCS(ccos ccosf ccosh ccoshf cexp cexpf c_log c_logf \
+  clog10 clog10f cpow cpowf csin csinf csinh csinhf csqrt csqrtf \
+  ctan ctanf ctanh ctanhf \
+  carg cargf nan hypot hypotf atan2f expf copysignf)
+
+  dnl We compile the long double complex functions only if the function 
+  dnl provides the non-complex long double functions.
+  USE_LONG_DOUBLE=no
+  AC_CHECK_FUNC(copysignl,
+  USE_LONG_DOUBLE=yes
+  AC_REPLACE_MATHFUNCS(ccoshl ccosl cexpl cpowl csinhl csinl \
+  csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l))
+  AC_SUBST(USE_COMPLEX_LONG_DOUBLE)
+])
+
 
 dnl Check to see what architecture we are compiling for. If it's
 dnl supported, use special hand-crafted routines to provide thread
@@ -1097,59 +1164,6 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
 ])
 
 
-dnl
-dnl Check to see what the underlying c library or math library is like.
-dnl
-dnl Define HAVE_CARGF etc if "cargf" is found.
-dnl
-dnl GLIBCPP_CHECK_MATH_SUPPORT
-AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
-  AC_CHECK_LIB(m, sin, libm="-lm")
-  save_LIBS="$LIBS"
-  LIBS="$LIBS $libm"
-
-  dnl Check for complex versions of math functions of platform.
-  AC_CHECK_HEADERS([complex.h])
-  AC_REPLACE_MATHFUNCS(ccos ccosf ccosh ccoshf cexp cexpf c_log c_logf \
-  clog10 clog10f cpow cpowf csin csinf csinh csinhf csqrt csqrtf \
-  ctan ctanf ctanh ctanhf \
-  carg cargf nan hypot hypotf atan2f expf copysignf)
-
-  dnl We compile the long double complex functions only if the function 
-  dnl provides the non-complex long double functions.
-  USE_LONG_DOUBLE=no
-  AC_CHECK_FUNC(copysignl,
-  USE_LONG_DOUBLE=yes
-  AC_REPLACE_MATHFUNCS(ccoshl ccosl cexpl cpowl csinhl csinl \
-  csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l))
-  AC_SUBST(USE_LONG_DOUBLE)
-
-  dnl Check to see if basic C math functions have float, long double versions.
-  AC_REPLACE_MATHFUNCS(cosf fabsf sinf sqrtf)
-  AC_CHECK_FUNCS(isnan isnanf isnanl isinf isinff isinfl copysign copysignl \
-  acosf acosl asinf asinl atanf atanl atan2f atan2l ceilf ceill cosl \
-  coshf coshl expf expl fabsl floorf floorl fmodf fmodl frexpf frexpl ldexpf \
-  ldexpl logf logl log10f log10l modff modfl powf powl sinl sinhf \
-  sinhl sqrtl tanf tanl tanhf tanhl strtof strtold sincos sincosf \
-  sincosl finite finitef finitel fqfinite fpclass qfpclass)
-
-#Some runtimes have these functions with a preceding underscore. Please
-# keep this sync'd with the one above. And if you add any new symbol,
-# please add the corresponding block in the @BOTTOM@ section of
-# acconfig.h.
-
-  AC_CHECK_FUNCS(_isnan _isnanf _isnanl _isinf _isinff _isinfl _copysign \
-  _copysignl _acosf _acosl _asinf _asinl _atanf _atanl _atan2f _atan2l \
-  _ceilf _ceill _cosf _cosl _coshf _coshl _expf _expl _fabsf _fabsl \
-  _floorf _floorl _fmodf _fmodl _frexpf _frexpl _ldexpf _ldexpl _logf _logl \
-  _log10f _log10l _modff _modfl _powf _powl _sinf _sinl _sinhf _sinhl \
-  _sqrtf _sqrtl _tanf _tanl _tanhf _tanhl _strtof _strtold _sincos _sincosf \
-  _sincosl _finite _finitef _finitel _fqfinite _fpclass _qfpclass)
-
-LIBS="$save_LIBS"
-])
-
-
 dnl
 dnl Check to see if this target can enable the wchar_t parts of libstdc++.
 dnl
@@ -1244,9 +1258,33 @@ dnl __complex__ float support.
 dnl
 dnl Define _GLIBCPP_BUGGY_FLOAT_COMPLEX if buggy.
 dnl
-dnl GLIBCPP_CHECK_COMPLEX_FLOAT_SUPPORT
-AC_DEFUN(GLIBCPP_CHECK_COMPLEX_FLOAT_SUPPORT, [
+dnl Check to see if this version of GNU C++ is afflicted by bugs in 
+dnl __complex__ support.Check for buggy __complex__ that will cause ICE in
+dnl gcc-2.95.x when using the library, unless we define the default copy
+dnl ctor in the specializations of complex<>. 
+dnl 
+dnl Define _GLIBCPP_BUGGY_COMPLEX if buggy.
+dnl GLIBCPP_CHECK_COMPLEX_MATH_COMPILER_SUPPORT
+AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_COMPILER_SUPPORT, [
   AC_REQUIRE([AC_PROG_CXX])
+
+  AC_MSG_CHECKING([for GNU C++ __complex__ support])
+  AC_CACHE_VAL(glibcpp_cv_complex, [
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+    AC_TRY_COMPILE([struct dcomplex { __complex__ double x; }; \
+		    dcomplex f(const dcomplex& x) { return dcomplex(x); }], \
+		    [ dcomplex x; f(x); ],
+      glibcpp_cv_complex=ok,
+      glibcpp_cv_complex=buggy
+    )
+    AC_LANG_RESTORE
+  ])
+  AC_MSG_RESULT($glibcpp_cv_complex)
+  if test $glibcpp_cv_complex = buggy; then
+    AC_DEFINE(_GLIBCPP_BUGGY_COMPLEX)
+  fi
+
   AC_MSG_CHECKING([for GNU C++ __complex__ float support])
   AC_CACHE_VAL(glibcpp_cv_float_complex, [
     AC_LANG_SAVE
@@ -1283,37 +1321,6 @@ EOB
 ])
 
 
-dnl
-dnl 
-dnl Check to see if this version of GNU C++ is afflicted by bugs in 
-dnl __complex__ support.Check for buggy __complex__ that will cause ICE in
-dnl gcc-2.95.x when using the library, unless we define the default copy
-dnl ctor in the specializations of complex<>. 
-dnl 
-dnl Define _GLIBCPP_BUGGY_COMPLEX if buggy.
-dnl
-dnl GLIBCPP_CHECK_COMPLEX_SUPPORT
-AC_DEFUN(GLIBCPP_CHECK_COMPLEX_SUPPORT, [
-  AC_REQUIRE([AC_PROG_CXX])
-  AC_MSG_CHECKING([for GNU C++ __complex__ support])
-  AC_CACHE_VAL(glibcpp_cv_complex, [
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    AC_TRY_COMPILE([struct dcomplex { __complex__ double x; }; \
-		    dcomplex f(const dcomplex& x) { return dcomplex(x); }], \
-		    [ dcomplex x; f(x); ],
-      glibcpp_cv_complex=ok,
-      glibcpp_cv_complex=buggy
-    )
-    AC_LANG_RESTORE
-  ])
-  AC_MSG_RESULT($glibcpp_cv_complex)
-  if test $glibcpp_cv_complex = buggy; then
-    AC_DEFINE(_GLIBCPP_BUGGY_COMPLEX)
-  fi
-])
-
-
 dnl
 dnl Check for special debugging mode; not for production use.
 dnl
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 9eb6a844405b6926d1f362f1c1a8e7ada7fe603d..ddf533aca391a1002164b69f1e1858636f94a382 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -2952,133 +2952,6 @@ cross_compiling=$ac_cv_prog_cc_cross
   
 
   
-  
-  echo $ac_n "checking for GNU C++ __complex__ support""... $ac_c" 1>&6
-echo "configure:2958: checking for GNU C++ __complex__ support" >&5
-  if eval "test \"`echo '$''{'glibcpp_cv_complex'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    
-    ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-    cat > conftest.$ac_ext <<EOF
-#line 2972 "configure"
-#include "confdefs.h"
-struct dcomplex { __complex__ double x; }; \
-		    dcomplex f(const dcomplex& x) { return dcomplex(x); }
-int main() {
-\
-		     dcomplex x; f(x); 
-; return 0; }
-EOF
-if { (eval echo configure:2981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  glibcpp_cv_complex=ok
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  glibcpp_cv_complex=buggy
-    
-fi
-rm -f conftest*
-    ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-  
-fi
-
-  echo "$ac_t""$glibcpp_cv_complex" 1>&6
-  if test $glibcpp_cv_complex = buggy; then
-    cat >> confdefs.h <<\EOF
-#define _GLIBCPP_BUGGY_COMPLEX 1
-EOF
-
-  fi
-
-  
-  
-  echo $ac_n "checking for GNU C++ __complex__ float support""... $ac_c" 1>&6
-echo "configure:3013: checking for GNU C++ __complex__ float support" >&5
-  if eval "test \"`echo '$''{'glibcpp_cv_float_complex'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    
-    ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-    rm -f conftest.h
-    cat > conftest.h <<EOB
-      //
-      // Check for buggy __complex__ that causes ICE in most versions of egcs
-      // and gcc-2.95.x on certain platforms (eg., x86-win32).
-      //
-      // See http://egcs.cygnus.com/ml/gcc-bugs/1999-07/msg00845.html for
-      // more info on the bug itself.
-      //
-      struct
-      float_complex
-      {
-       __complex__ float m_value;
-       float_complex (float = 0.0f, float = 0.0f);
-       float_complex (__complex__ float val) : m_value (val) {}
-       float_complex foo (const float_complex &val)
-         { return float_complex (~val.m_value); }
-      };
-EOB
-    cat > conftest.$ac_ext <<EOF
-#line 3046 "configure"
-#include "confdefs.h"
-#include "conftest.h"
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:3053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  glibcpp_cv_float_complex=ok
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  glibcpp_cv_float_complex=buggy
-    
-fi
-rm -f conftest*
-    ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-  
-fi
-
-  echo "$ac_t""$glibcpp_cv_float_complex" 1>&6
-  if test $glibcpp_cv_float_complex = buggy; then
-    cat >> confdefs.h <<\EOF
-#define _GLIBCPP_BUGGY_FLOAT_COMPLEX 1
-EOF
-
-  fi
-
-  
     
   ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -3088,16 +2961,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
   echo $ac_n "checking for __builtin_acos""... $ac_c" 1>&6
-echo "configure:3092: checking for __builtin_acos" >&5
+echo "configure:2965: checking for __builtin_acos" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3094 "configure"
+#line 2967 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_acos(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_acos=yes
 else
@@ -3115,16 +2988,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_acosf""... $ac_c" 1>&6
-echo "configure:3119: checking for __builtin_acosf" >&5
+echo "configure:2992: checking for __builtin_acosf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3121 "configure"
+#line 2994 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_acosf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_acosf=yes
 else
@@ -3142,16 +3015,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_acosl""... $ac_c" 1>&6
-echo "configure:3146: checking for __builtin_acosl" >&5
+echo "configure:3019: checking for __builtin_acosl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3148 "configure"
+#line 3021 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_acosl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_acosl=yes
 else
@@ -3169,16 +3042,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_asin""... $ac_c" 1>&6
-echo "configure:3173: checking for __builtin_asin" >&5
+echo "configure:3046: checking for __builtin_asin" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3175 "configure"
+#line 3048 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_asin(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_asin=yes
 else
@@ -3196,16 +3069,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_asinf""... $ac_c" 1>&6
-echo "configure:3200: checking for __builtin_asinf" >&5
+echo "configure:3073: checking for __builtin_asinf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3202 "configure"
+#line 3075 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_asinf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_asinf=yes
 else
@@ -3223,16 +3096,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_asinl""... $ac_c" 1>&6
-echo "configure:3227: checking for __builtin_asinl" >&5
+echo "configure:3100: checking for __builtin_asinl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3229 "configure"
+#line 3102 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_asinl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_asinl=yes
 else
@@ -3250,16 +3123,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_atan""... $ac_c" 1>&6
-echo "configure:3254: checking for __builtin_atan" >&5
+echo "configure:3127: checking for __builtin_atan" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3256 "configure"
+#line 3129 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_atan(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_atan=yes
 else
@@ -3277,16 +3150,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_atanf""... $ac_c" 1>&6
-echo "configure:3281: checking for __builtin_atanf" >&5
+echo "configure:3154: checking for __builtin_atanf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3283 "configure"
+#line 3156 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_atanf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_atanf=yes
 else
@@ -3304,16 +3177,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_atanl""... $ac_c" 1>&6
-echo "configure:3308: checking for __builtin_atanl" >&5
+echo "configure:3181: checking for __builtin_atanl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3310 "configure"
+#line 3183 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_atanl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_atanl=yes
 else
@@ -3331,16 +3204,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_atan2""... $ac_c" 1>&6
-echo "configure:3335: checking for __builtin_atan2" >&5
+echo "configure:3208: checking for __builtin_atan2" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3337 "configure"
+#line 3210 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_atan2(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_atan2=yes
 else
@@ -3358,16 +3231,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_atan2f""... $ac_c" 1>&6
-echo "configure:3362: checking for __builtin_atan2f" >&5
+echo "configure:3235: checking for __builtin_atan2f" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3364 "configure"
+#line 3237 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_atan2f(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_atan2f=yes
 else
@@ -3385,16 +3258,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_atan2l""... $ac_c" 1>&6
-echo "configure:3389: checking for __builtin_atan2l" >&5
+echo "configure:3262: checking for __builtin_atan2l" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3391 "configure"
+#line 3264 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_atan2l(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_atan2l=yes
 else
@@ -3412,16 +3285,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_ceil""... $ac_c" 1>&6
-echo "configure:3416: checking for __builtin_ceil" >&5
+echo "configure:3289: checking for __builtin_ceil" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3418 "configure"
+#line 3291 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_fceil(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_ceil=yes
 else
@@ -3439,16 +3312,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_ceilf""... $ac_c" 1>&6
-echo "configure:3443: checking for __builtin_ceilf" >&5
+echo "configure:3316: checking for __builtin_ceilf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3445 "configure"
+#line 3318 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_ceilf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_ceilf=yes
 else
@@ -3466,16 +3339,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_ceill""... $ac_c" 1>&6
-echo "configure:3470: checking for __builtin_ceill" >&5
+echo "configure:3343: checking for __builtin_ceill" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3472 "configure"
+#line 3345 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_ceill(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_ceill=yes
 else
@@ -3493,16 +3366,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_cos""... $ac_c" 1>&6
-echo "configure:3497: checking for __builtin_cos" >&5
+echo "configure:3370: checking for __builtin_cos" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3499 "configure"
+#line 3372 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_cos(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_cos=yes
 else
@@ -3520,16 +3393,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_cosf""... $ac_c" 1>&6
-echo "configure:3524: checking for __builtin_cosf" >&5
+echo "configure:3397: checking for __builtin_cosf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3526 "configure"
+#line 3399 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_cosf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_cosf=yes
 else
@@ -3547,16 +3420,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_cosl""... $ac_c" 1>&6
-echo "configure:3551: checking for __builtin_cosl" >&5
+echo "configure:3424: checking for __builtin_cosl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3553 "configure"
+#line 3426 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_cosl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_cosl=yes
 else
@@ -3574,16 +3447,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_cosh""... $ac_c" 1>&6
-echo "configure:3578: checking for __builtin_cosh" >&5
+echo "configure:3451: checking for __builtin_cosh" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3580 "configure"
+#line 3453 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_cosh(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_cosh=yes
 else
@@ -3601,16 +3474,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_coshf""... $ac_c" 1>&6
-echo "configure:3605: checking for __builtin_coshf" >&5
+echo "configure:3478: checking for __builtin_coshf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3607 "configure"
+#line 3480 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_coshf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_coshf=yes
 else
@@ -3628,16 +3501,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_coshl""... $ac_c" 1>&6
-echo "configure:3632: checking for __builtin_coshl" >&5
+echo "configure:3505: checking for __builtin_coshl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3634 "configure"
+#line 3507 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_coshl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_coshl=yes
 else
@@ -3655,16 +3528,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_exp""... $ac_c" 1>&6
-echo "configure:3659: checking for __builtin_exp" >&5
+echo "configure:3532: checking for __builtin_exp" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3661 "configure"
+#line 3534 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_exp(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_exp=yes
 else
@@ -3682,16 +3555,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_expf""... $ac_c" 1>&6
-echo "configure:3686: checking for __builtin_expf" >&5
+echo "configure:3559: checking for __builtin_expf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3688 "configure"
+#line 3561 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_expf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_expf=yes
 else
@@ -3709,16 +3582,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_expl""... $ac_c" 1>&6
-echo "configure:3713: checking for __builtin_expl" >&5
+echo "configure:3586: checking for __builtin_expl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3715 "configure"
+#line 3588 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_expl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_expl=yes
 else
@@ -3736,16 +3609,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_fabs""... $ac_c" 1>&6
-echo "configure:3740: checking for __builtin_fabs" >&5
+echo "configure:3613: checking for __builtin_fabs" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3742 "configure"
+#line 3615 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_fabs(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_fabs=yes
 else
@@ -3763,16 +3636,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_fabsf""... $ac_c" 1>&6
-echo "configure:3767: checking for __builtin_fabsf" >&5
+echo "configure:3640: checking for __builtin_fabsf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3769 "configure"
+#line 3642 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_fabsf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_fabsf=yes
 else
@@ -3790,16 +3663,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_fabsl""... $ac_c" 1>&6
-echo "configure:3794: checking for __builtin_fabsl" >&5
+echo "configure:3667: checking for __builtin_fabsl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3796 "configure"
+#line 3669 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_fabsl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_fabsl=yes
 else
@@ -3817,16 +3690,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_floor""... $ac_c" 1>&6
-echo "configure:3821: checking for __builtin_floor" >&5
+echo "configure:3694: checking for __builtin_floor" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3823 "configure"
+#line 3696 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_floor(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_floor=yes
 else
@@ -3844,16 +3717,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_floorf""... $ac_c" 1>&6
-echo "configure:3848: checking for __builtin_floorf" >&5
+echo "configure:3721: checking for __builtin_floorf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3850 "configure"
+#line 3723 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_floorf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_floorf=yes
 else
@@ -3871,16 +3744,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_floorl""... $ac_c" 1>&6
-echo "configure:3875: checking for __builtin_floorl" >&5
+echo "configure:3748: checking for __builtin_floorl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3877 "configure"
+#line 3750 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_floorl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_floorl=yes
 else
@@ -3898,16 +3771,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_fmod""... $ac_c" 1>&6
-echo "configure:3902: checking for __builtin_fmod" >&5
+echo "configure:3775: checking for __builtin_fmod" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3904 "configure"
+#line 3777 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_fmod(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_fmod=yes
 else
@@ -3925,16 +3798,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_fmodf""... $ac_c" 1>&6
-echo "configure:3929: checking for __builtin_fmodf" >&5
+echo "configure:3802: checking for __builtin_fmodf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3931 "configure"
+#line 3804 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_fmodf(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_fmodf=yes
 else
@@ -3952,16 +3825,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_fmodl""... $ac_c" 1>&6
-echo "configure:3956: checking for __builtin_fmodl" >&5
+echo "configure:3829: checking for __builtin_fmodl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3958 "configure"
+#line 3831 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_fmodl(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_fmodl=yes
 else
@@ -3979,16 +3852,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_frexp""... $ac_c" 1>&6
-echo "configure:3983: checking for __builtin_frexp" >&5
+echo "configure:3856: checking for __builtin_frexp" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3985 "configure"
+#line 3858 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_frexp(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:3992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_frexp=yes
 else
@@ -4006,16 +3879,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_frexpf""... $ac_c" 1>&6
-echo "configure:4010: checking for __builtin_frexpf" >&5
+echo "configure:3883: checking for __builtin_frexpf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4012 "configure"
+#line 3885 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_frexpf(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:4019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_frexpf=yes
 else
@@ -4033,16 +3906,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_frexpl""... $ac_c" 1>&6
-echo "configure:4037: checking for __builtin_frexpl" >&5
+echo "configure:3910: checking for __builtin_frexpl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4039 "configure"
+#line 3912 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_frexpl(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:4046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_frexpl=yes
 else
@@ -4060,16 +3933,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_ldexp""... $ac_c" 1>&6
-echo "configure:4064: checking for __builtin_ldexp" >&5
+echo "configure:3937: checking for __builtin_ldexp" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4066 "configure"
+#line 3939 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_ldexp(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:4073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_ldexp=yes
 else
@@ -4087,16 +3960,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_ldexpf""... $ac_c" 1>&6
-echo "configure:4091: checking for __builtin_ldexpf" >&5
+echo "configure:3964: checking for __builtin_ldexpf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4093 "configure"
+#line 3966 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_ldexpf(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:4100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_ldexpf=yes
 else
@@ -4114,16 +3987,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_ldexpl""... $ac_c" 1>&6
-echo "configure:4118: checking for __builtin_ldexpl" >&5
+echo "configure:3991: checking for __builtin_ldexpl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4120 "configure"
+#line 3993 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_ldexpl(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:4127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_ldexpl=yes
 else
@@ -4141,16 +4014,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_log""... $ac_c" 1>&6
-echo "configure:4145: checking for __builtin_log" >&5
+echo "configure:4018: checking for __builtin_log" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4147 "configure"
+#line 4020 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_log(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_log=yes
 else
@@ -4168,16 +4041,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_logf""... $ac_c" 1>&6
-echo "configure:4172: checking for __builtin_logf" >&5
+echo "configure:4045: checking for __builtin_logf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4174 "configure"
+#line 4047 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_logf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_logf=yes
 else
@@ -4195,16 +4068,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_logl""... $ac_c" 1>&6
-echo "configure:4199: checking for __builtin_logl" >&5
+echo "configure:4072: checking for __builtin_logl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4201 "configure"
+#line 4074 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_logl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_logl=yes
 else
@@ -4222,16 +4095,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_log10""... $ac_c" 1>&6
-echo "configure:4226: checking for __builtin_log10" >&5
+echo "configure:4099: checking for __builtin_log10" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4228 "configure"
+#line 4101 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_log10(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_log10=yes
 else
@@ -4249,16 +4122,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_log10f""... $ac_c" 1>&6
-echo "configure:4253: checking for __builtin_log10f" >&5
+echo "configure:4126: checking for __builtin_log10f" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4255 "configure"
+#line 4128 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_log10f(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_log10f=yes
 else
@@ -4276,16 +4149,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_log10l""... $ac_c" 1>&6
-echo "configure:4280: checking for __builtin_log10l" >&5
+echo "configure:4153: checking for __builtin_log10l" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4282 "configure"
+#line 4155 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_log10l(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_log10l=yes
 else
@@ -4303,16 +4176,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_modf""... $ac_c" 1>&6
-echo "configure:4307: checking for __builtin_modf" >&5
+echo "configure:4180: checking for __builtin_modf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4309 "configure"
+#line 4182 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_modf(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:4316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_modf=yes
 else
@@ -4330,16 +4203,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_modff""... $ac_c" 1>&6
-echo "configure:4334: checking for __builtin_modff" >&5
+echo "configure:4207: checking for __builtin_modff" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4336 "configure"
+#line 4209 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_modff(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:4343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_modff=yes
 else
@@ -4357,16 +4230,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_modfl""... $ac_c" 1>&6
-echo "configure:4361: checking for __builtin_modfl" >&5
+echo "configure:4234: checking for __builtin_modfl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4363 "configure"
+#line 4236 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_modfl(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:4370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_modfl=yes
 else
@@ -4384,16 +4257,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_pow""... $ac_c" 1>&6
-echo "configure:4388: checking for __builtin_pow" >&5
+echo "configure:4261: checking for __builtin_pow" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4390 "configure"
+#line 4263 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_pow(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4270: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_pow=yes
 else
@@ -4411,16 +4284,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_powf""... $ac_c" 1>&6
-echo "configure:4415: checking for __builtin_powf" >&5
+echo "configure:4288: checking for __builtin_powf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4417 "configure"
+#line 4290 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_powf(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_powf=yes
 else
@@ -4438,16 +4311,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_powl""... $ac_c" 1>&6
-echo "configure:4442: checking for __builtin_powl" >&5
+echo "configure:4315: checking for __builtin_powl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4444 "configure"
+#line 4317 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_powl(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_powl=yes
 else
@@ -4465,16 +4338,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sin""... $ac_c" 1>&6
-echo "configure:4469: checking for __builtin_sin" >&5
+echo "configure:4342: checking for __builtin_sin" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4471 "configure"
+#line 4344 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_sin(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sin=yes
 else
@@ -4492,16 +4365,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sinf""... $ac_c" 1>&6
-echo "configure:4496: checking for __builtin_sinf" >&5
+echo "configure:4369: checking for __builtin_sinf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4498 "configure"
+#line 4371 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_sinf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sinf=yes
 else
@@ -4519,16 +4392,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sinl""... $ac_c" 1>&6
-echo "configure:4523: checking for __builtin_sinl" >&5
+echo "configure:4396: checking for __builtin_sinl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4525 "configure"
+#line 4398 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_sinl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sinl=yes
 else
@@ -4546,16 +4419,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sinh""... $ac_c" 1>&6
-echo "configure:4550: checking for __builtin_sinh" >&5
+echo "configure:4423: checking for __builtin_sinh" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4552 "configure"
+#line 4425 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_sinh(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sinh=yes
 else
@@ -4573,16 +4446,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sinhf""... $ac_c" 1>&6
-echo "configure:4577: checking for __builtin_sinhf" >&5
+echo "configure:4450: checking for __builtin_sinhf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4579 "configure"
+#line 4452 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_sinhf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sinhf=yes
 else
@@ -4600,16 +4473,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sinhl""... $ac_c" 1>&6
-echo "configure:4604: checking for __builtin_sinhl" >&5
+echo "configure:4477: checking for __builtin_sinhl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4606 "configure"
+#line 4479 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_sinhl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sinhl=yes
 else
@@ -4627,16 +4500,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sqrt""... $ac_c" 1>&6
-echo "configure:4631: checking for __builtin_sqrt" >&5
+echo "configure:4504: checking for __builtin_sqrt" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4633 "configure"
+#line 4506 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_fsqrt(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sqrt=yes
 else
@@ -4654,16 +4527,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sqrtf""... $ac_c" 1>&6
-echo "configure:4658: checking for __builtin_sqrtf" >&5
+echo "configure:4531: checking for __builtin_sqrtf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4660 "configure"
+#line 4533 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_sqrtf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sqrtf=yes
 else
@@ -4681,16 +4554,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sqrtl""... $ac_c" 1>&6
-echo "configure:4685: checking for __builtin_sqrtl" >&5
+echo "configure:4558: checking for __builtin_sqrtl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4687 "configure"
+#line 4560 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_sqrtl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sqrtl=yes
 else
@@ -4708,16 +4581,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_tan""... $ac_c" 1>&6
-echo "configure:4712: checking for __builtin_tan" >&5
+echo "configure:4585: checking for __builtin_tan" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4714 "configure"
+#line 4587 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_tan(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_tan=yes
 else
@@ -4735,16 +4608,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_tanf""... $ac_c" 1>&6
-echo "configure:4739: checking for __builtin_tanf" >&5
+echo "configure:4612: checking for __builtin_tanf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4741 "configure"
+#line 4614 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_tanf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_tanf=yes
 else
@@ -4762,16 +4635,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_tanl""... $ac_c" 1>&6
-echo "configure:4766: checking for __builtin_tanl" >&5
+echo "configure:4639: checking for __builtin_tanl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4768 "configure"
+#line 4641 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_tanl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_tanl=yes
 else
@@ -4789,16 +4662,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_tanh""... $ac_c" 1>&6
-echo "configure:4793: checking for __builtin_tanh" >&5
+echo "configure:4666: checking for __builtin_tanh" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4795 "configure"
+#line 4668 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_tanh(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_tanh=yes
 else
@@ -4816,16 +4689,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_tanhf""... $ac_c" 1>&6
-echo "configure:4820: checking for __builtin_tanhf" >&5
+echo "configure:4693: checking for __builtin_tanhf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4822 "configure"
+#line 4695 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_tanhf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4702: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_tanhf=yes
 else
@@ -4843,16 +4716,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_tanhl""... $ac_c" 1>&6
-echo "configure:4847: checking for __builtin_tanhl" >&5
+echo "configure:4720: checking for __builtin_tanhl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4849 "configure"
+#line 4722 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_tanhl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_tanhl=yes
 else
@@ -4878,8 +4751,17 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 
   
+  
+  ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+
   echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4883: checking for sin in -lm" >&5
+echo "configure:4765: checking for sin in -lm" >&5
 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4887,9 +4769,12 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4891 "configure"
+#line 4773 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char sin();
@@ -4898,7 +4783,7 @@ int main() {
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4921,63 +4806,23 @@ fi
   save_LIBS="$LIBS"
   LIBS="$LIBS $libm"
 
-    for ac_hdr in complex.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4929: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4934 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-  for ac_func in ccos ccosf ccosh ccoshf cexp cexpf c_log c_logf \
-  clog10 clog10f cpow cpowf csin csinf csinh csinhf csqrt csqrtf \
-  ctan ctanf ctanh ctanhf \
-  carg cargf nan hypot hypotf atan2f expf copysignf
+    for ac_func in cosf fabsf sinf sqrtf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4971: checking for $ac_func" >&5
+echo "configure:4813: 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 4976 "configure"
+#line 4818 "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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* 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();
@@ -4995,7 +4840,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4844: \"$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
@@ -5021,67 +4866,98 @@ fi
 done
 
 
-
-      USE_LONG_DOUBLE=no
-  echo $ac_n "checking for copysignl""... $ac_c" 1>&6
-echo "configure:5028: checking for copysignl" >&5
-if eval "test \"`echo '$''{'ac_cv_func_copysignl'+set}'`\" = set"; then
+  for ac_func in isnan isnanf isnanl isinf isinff isinfl copysign copysignl \
+  acosf acosl asinf asinl atanf atanl atan2f atan2l ceilf ceill cosl \
+  coshf coshl expf expl fabsl floorf floorl fmodf fmodl frexpf frexpl ldexpf \
+  ldexpl logf logl log10f log10l modff modfl powf powl sinl sinhf \
+  sinhl sqrtl tanf tanl tanhf tanhl strtof strtold sincos sincosf \
+  sincosl finite finitef finitel fqfinite fpclass qfpclass
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:4878: 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 5033 "configure"
+#line 4883 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char copysignl(); below.  */
+    which can conflict with char $ac_func(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char copysignl();
+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_copysignl) || defined (__stub___copysignl)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-copysignl();
+$ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:5056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_func_copysignl=yes"
+  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_copysignl=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
 fi
 
-if eval "test \"`echo '$ac_cv_func_'copysignl`\" = yes"; then
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  USE_LONG_DOUBLE=yes
-  for ac_func in ccoshl ccosl cexpl cpowl csinhl csinl \
-  csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l
+    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
+
+
+#Some runtimes have these functions with a preceding underscore. Please
+# keep this sync'd with the one above. And if you add any new symbol,
+# please add the corresponding block in the @BOTTOM@ section of
+# acconfig.h.
+
+  for ac_func in _isnan _isnanf _isnanl _isinf _isinff _isinfl _copysign \
+  _copysignl _acosf _acosl _asinf _asinl _atanf _atanl _atan2f _atan2l \
+  _ceilf _ceill _cosf _cosl _coshf _coshl _expf _expl _fabsf _fabsl \
+  _floorf _floorl _fmodf _fmodl _frexpf _frexpl _ldexpf _ldexpl _logf _logl \
+  _log10f _log10l _modff _modfl _powf _powl _sinf _sinl _sinhf _sinhl \
+  _sqrtf _sqrtl _tanf _tanl _tanhf _tanhl _strtof _strtold _sincos _sincosf \
+  _sincosl _finite _finitef _finitel _fqfinite _fpclass _qfpclass
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5075: checking for $ac_func" >&5
+echo "configure:4948: 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 5080 "configure"
+#line 4953 "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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* 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();
@@ -5099,7 +4975,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4979: \"$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
@@ -5120,26 +4996,72 @@ EOF
  
 else
   echo "$ac_t""no" 1>&6
-LIBMATHOBJS="$LIBMATHOBJS ${ac_func}.lo"
 fi
 done
 
 
+  LIBS="$save_LIBS"
+  ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+
+  
+    for ac_hdr in complex.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:5018: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 5023 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:5028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
 else
   echo "$ac_t""no" 1>&6
 fi
+done
 
-  
-
-    for ac_func in cosf fabsf sinf sqrtf
+  for ac_func in ccos ccosf ccosh ccoshf cexp cexpf c_log c_logf \
+  clog10 clog10f cpow cpowf csin csinf csinh csinhf csqrt csqrtf \
+  ctan ctanf ctanh ctanhf \
+  carg cargf nan hypot hypotf atan2f expf copysignf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5138: checking for $ac_func" >&5
+echo "configure:5060: 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 5143 "configure"
+#line 5065 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5162,7 +5084,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5088: \"$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
@@ -5188,87 +5110,62 @@ fi
 done
 
 
-  for ac_func in isnan isnanf isnanl isinf isinff isinfl copysign copysignl \
-  acosf acosl asinf asinl atanf atanl atan2f atan2l ceilf ceill cosl \
-  coshf coshl expf expl fabsl floorf floorl fmodf fmodl frexpf frexpl ldexpf \
-  ldexpl logf logl log10f log10l modff modfl powf powl sinl sinhf \
-  sinhl sqrtl tanf tanl tanhf tanhl strtof strtold sincos sincosf \
-  sincosl finite finitef finitel fqfinite fpclass qfpclass
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5200: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+
+      USE_LONG_DOUBLE=no
+  echo $ac_n "checking for copysignl""... $ac_c" 1>&6
+echo "configure:5117: checking for copysignl" >&5
+if eval "test \"`echo '$''{'ac_cv_func_copysignl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5205 "configure"
+#line 5122 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
+    which can conflict with char copysignl(); 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();
+char copysignl();
 
 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)
+#if defined (__stub_copysignl) || defined (__stub___copysignl)
 choke me
 #else
-$ac_func();
+copysignl();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:5228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5145: \"$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"
+  eval "ac_cv_func_copysignl=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
+  eval "ac_cv_func_copysignl=no"
 fi
 rm -f conftest*
 fi
 
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+if eval "test \"`echo '$ac_cv_func_'copysignl`\" = 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
-
-
-#Some runtimes have these functions with a preceding underscore. Please
-# keep this sync'd with the one above. And if you add any new symbol,
-# please add the corresponding block in the @BOTTOM@ section of
-# acconfig.h.
-
-  for ac_func in _isnan _isnanf _isnanl _isinf _isinff _isinfl _copysign \
-  _copysignl _acosf _acosl _asinf _asinl _atanf _atanl _atan2f _atan2l \
-  _ceilf _ceill _cosf _cosl _coshf _coshl _expf _expl _fabsf _fabsl \
-  _floorf _floorl _fmodf _fmodl _frexpf _frexpl _ldexpf _ldexpl _logf _logl \
-  _log10f _log10l _modff _modfl _powf _powl _sinf _sinl _sinhf _sinhl \
-  _sqrtf _sqrtl _tanf _tanl _tanhf _tanhl _strtof _strtold _sincos _sincosf \
-  _sincosl _finite _finitef _finitel _fqfinite _fpclass _qfpclass
+  USE_LONG_DOUBLE=yes
+  for ac_func in ccoshl ccosl cexpl cpowl csinhl csinl \
+  csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5267: checking for $ac_func" >&5
+echo "configure:5164: 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 5272 "configure"
+#line 5169 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5291,7 +5188,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5192: \"$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
@@ -5312,27 +5209,158 @@ EOF
  
 else
   echo "$ac_t""no" 1>&6
+LIBMATHOBJS="$LIBMATHOBJS ${ac_func}.lo"
 fi
 done
 
 
-LIBS="$save_LIBS"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  
+
+  
+  
+
+  echo $ac_n "checking for GNU C++ __complex__ support""... $ac_c" 1>&6
+echo "configure:5228: checking for GNU C++ __complex__ support" >&5
+  if eval "test \"`echo '$''{'glibcpp_cv_complex'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    
+    ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+    cat > conftest.$ac_ext <<EOF
+#line 5242 "configure"
+#include "confdefs.h"
+struct dcomplex { __complex__ double x; }; \
+		    dcomplex f(const dcomplex& x) { return dcomplex(x); }
+int main() {
+\
+		     dcomplex x; f(x); 
+; return 0; }
+EOF
+if { (eval echo configure:5251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  glibcpp_cv_complex=ok
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  glibcpp_cv_complex=buggy
+    
+fi
+rm -f conftest*
+    ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+  
+fi
+
+  echo "$ac_t""$glibcpp_cv_complex" 1>&6
+  if test $glibcpp_cv_complex = buggy; then
+    cat >> confdefs.h <<\EOF
+#define _GLIBCPP_BUGGY_COMPLEX 1
+EOF
+
+  fi
+
+  echo $ac_n "checking for GNU C++ __complex__ float support""... $ac_c" 1>&6
+echo "configure:5281: checking for GNU C++ __complex__ float support" >&5
+  if eval "test \"`echo '$''{'glibcpp_cv_float_complex'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    
+    ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+    rm -f conftest.h
+    cat > conftest.h <<EOB
+      //
+      // Check for buggy __complex__ that causes ICE in most versions of egcs
+      // and gcc-2.95.x on certain platforms (eg., x86-win32).
+      //
+      // See http://egcs.cygnus.com/ml/gcc-bugs/1999-07/msg00845.html for
+      // more info on the bug itself.
+      //
+      struct
+      float_complex
+      {
+       __complex__ float m_value;
+       float_complex (float = 0.0f, float = 0.0f);
+       float_complex (__complex__ float val) : m_value (val) {}
+       float_complex foo (const float_complex &val)
+         { return float_complex (~val.m_value); }
+      };
+EOB
+    cat > conftest.$ac_ext <<EOF
+#line 5314 "configure"
+#include "confdefs.h"
+#include "conftest.h"
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:5321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  glibcpp_cv_float_complex=ok
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  glibcpp_cv_float_complex=buggy
+    
+fi
+rm -f conftest*
+    ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+  
+fi
+
+  echo "$ac_t""$glibcpp_cv_float_complex" 1>&6
+  if test $glibcpp_cv_float_complex = buggy; then
+    cat >> confdefs.h <<\EOF
+#define _GLIBCPP_BUGGY_FLOAT_COMPLEX 1
+EOF
+
+  fi
 
   
 
     ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
-echo "configure:5326: checking for wchar.h" >&5
+echo "configure:5354: checking for wchar.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5331 "configure"
+#line 5359 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5356,17 +5384,17 @@ fi
 
   ac_safe=`echo "wctype.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wctype.h""... $ac_c" 1>&6
-echo "configure:5360: checking for wctype.h" >&5
+echo "configure:5388: checking for wctype.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5365 "configure"
+#line 5393 "configure"
 #include "confdefs.h"
 #include <wctype.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5392,16 +5420,16 @@ fi
     if test x"$ac_has_wchar_h" = xyes && test x"$ac_has_wctype_h" = xyes; then
 
         echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6
-echo "configure:5396: checking for mbstate_t" >&5
+echo "configure:5424: checking for mbstate_t" >&5
     cat > conftest.$ac_ext <<EOF
-#line 5398 "configure"
+#line 5426 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 int main() {
 mbstate_t teststate;
 ; return 0; }
 EOF
-if { (eval echo configure:5405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_native_mbstatet=yes
 else
@@ -5420,16 +5448,16 @@ EOF
     fi
   
             echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6
-echo "configure:5424: checking for WCHAR_MIN and WCHAR_MAX" >&5
+echo "configure:5452: checking for WCHAR_MIN and WCHAR_MAX" >&5
     cat > conftest.$ac_ext <<EOF
-#line 5426 "configure"
+#line 5454 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 int main() {
 int i = WCHAR_MIN; int j = WCHAR_MAX;
 ; return 0; }
 EOF
-if { (eval echo configure:5433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   has_wchar_minmax=yes
 else
@@ -5442,9 +5470,9 @@ rm -f conftest*
     echo "$ac_t""$has_wchar_minmax" 1>&6
   
             echo $ac_n "checking for WEOF""... $ac_c" 1>&6
-echo "configure:5446: checking for WEOF" >&5
+echo "configure:5474: checking for WEOF" >&5
     cat > conftest.$ac_ext <<EOF
-#line 5448 "configure"
+#line 5476 "configure"
 #include "confdefs.h"
 
       #include <wchar.h>
@@ -5453,7 +5481,7 @@ int main() {
 wint_t i = WEOF;
 ; return 0; }
 EOF
-if { (eval echo configure:5457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   has_weof=yes
 else
@@ -5468,12 +5496,12 @@ rm -f conftest*
         for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5472: checking for $ac_func" >&5
+echo "configure:5500: 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 5477 "configure"
+#line 5505 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5496,7 +5524,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5528: \"$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
@@ -5523,7 +5551,7 @@ done
 
 
     echo $ac_n "checking for ISO C9X wchar_t support""... $ac_c" 1>&6
-echo "configure:5527: checking for ISO C9X wchar_t support" >&5
+echo "configure:5555: checking for ISO C9X wchar_t support" >&5
     if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes && test x"$ac_wfuncs" = xyes; then
       ac_isoC9X_wchar_t=yes
     else
@@ -5533,17 +5561,17 @@ echo "configure:5527: checking for ISO C9X wchar_t support" >&5
 
             ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
-echo "configure:5537: checking for iconv.h" >&5
+echo "configure:5565: checking for iconv.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5542 "configure"
+#line 5570 "configure"
 #include "confdefs.h"
 #include <iconv.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5568,12 +5596,12 @@ fi
     for ac_func in iconv_open iconv_close iconv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5572: checking for $ac_func" >&5
+echo "configure:5600: 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 5577 "configure"
+#line 5605 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5596,7 +5624,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5628: \"$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
@@ -5623,7 +5651,7 @@ done
 
 
     echo $ac_n "checking for XPG2 wchar_t support""... $ac_c" 1>&6
-echo "configure:5627: checking for XPG2 wchar_t support" >&5
+echo "configure:5655: checking for XPG2 wchar_t support" >&5
     if test x"$ac_has_iconv_h" = xyes && test x"$ac_XPG2funcs" = xyes; then
       ac_XPG2_wchar_t=yes
     else
@@ -5632,7 +5660,7 @@ echo "configure:5627: checking for XPG2 wchar_t support" >&5
     echo "$ac_t""$ac_XPG2_wchar_t" 1>&6
 
             echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6
-echo "configure:5636: checking for enabled wchar_t specializations" >&5
+echo "configure:5664: checking for enabled wchar_t specializations" >&5
     if test x"$ac_isoC9X_wchar_t" = xyes && test x"$ac_XPG2_wchar_t" = xyes; then
       libinst_wstring_la="libinst-wstring.la"
       cat >> confdefs.h <<\EOF
@@ -5657,17 +5685,17 @@ EOF
   
   ac_safe=`echo "ctype.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ctype.h""... $ac_c" 1>&6
-echo "configure:5661: checking for ctype.h" >&5
+echo "configure:5689: checking for ctype.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5666 "configure"
+#line 5694 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5688,9 +5716,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
         ctype_default=yes
 
         echo $ac_n "checking <ctype> for gnu-linux ""... $ac_c" 1>&6
-echo "configure:5692: checking <ctype> for gnu-linux " >&5
+echo "configure:5720: checking <ctype> for gnu-linux " >&5
     cat > conftest.$ac_ext <<EOF
-#line 5694 "configure"
+#line 5722 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -5701,7 +5729,7 @@ int
 	+ __ctype_tolower[a] + __ctype_toupper[a] + __ctype_b[a];}
 ; return 0; }
 EOF
-if { (eval echo configure:5705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_linux=yes
@@ -5720,9 +5748,9 @@ rm -f conftest*
 
         if test $ctype_default = "yes"; then
     echo $ac_n "checking <ctype> for freebsd 4.0 ""... $ac_c" 1>&6
-echo "configure:5724: checking <ctype> for freebsd 4.0 " >&5
+echo "configure:5752: checking <ctype> for freebsd 4.0 " >&5
     cat > conftest.$ac_ext <<EOF
-#line 5726 "configure"
+#line 5754 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -5732,7 +5760,7 @@ int
 	+ _CTYPE_D + _CTYPE_P + _CTYPE_X + _CTYPE_G ;}
 ; return 0; }
 EOF
-if { (eval echo configure:5736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_bsd=yes
@@ -5752,9 +5780,9 @@ rm -f conftest*
 
         if test $ctype_default = "yes"; then
     echo $ac_n "checking <ctype> for freebsd 3.4 ""... $ac_c" 1>&6
-echo "configure:5756: checking <ctype> for freebsd 3.4 " >&5
+echo "configure:5784: checking <ctype> for freebsd 3.4 " >&5
     cat > conftest.$ac_ext <<EOF
-#line 5758 "configure"
+#line 5786 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -5764,7 +5792,7 @@ int
       + _D + _P + _X + _G + __istype (a, 0);}
 ; return 0; }
 EOF
-if { (eval echo configure:5768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_freebsd34=yes
@@ -5784,9 +5812,9 @@ rm -f conftest*
 
         if test $ctype_default = "yes"; then
     echo $ac_n "checking <ctype> for solaris 2.6,7,8 ""... $ac_c" 1>&6
-echo "configure:5788: checking <ctype> for solaris 2.6,7,8 " >&5
+echo "configure:5816: checking <ctype> for solaris 2.6,7,8 " >&5
     cat > conftest.$ac_ext <<EOF
-#line 5790 "configure"
+#line 5818 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -5797,7 +5825,7 @@ int
 	+ __trans_lower[a] + __trans_upper[a] + __ctype_mask[a];}
 ; return 0; }
 EOF
-if { (eval echo configure:5801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_solaris=yes
@@ -5812,7 +5840,7 @@ rm -f conftest*
 
     if test $ctype_solaris = "yes"; then
       echo $ac_n "checking   for version""... $ac_c" 1>&6
-echo "configure:5816: checking   for version" >&5
+echo "configure:5844: checking   for version" >&5
       ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -5821,14 +5849,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
  
       cat > conftest.$ac_ext <<EOF
-#line 5825 "configure"
+#line 5853 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
 typedef long* __to_type; __to_type const& _M_toupper = __trans_upper;
 ; return 0; }
 EOF
-if { (eval echo configure:5832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
       ctype_solaris26=yes
@@ -5860,9 +5888,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 
         if test $ctype_default = "yes"; then
     echo $ac_n "checking <ctype> for solaris 2.5.1 ""... $ac_c" 1>&6
-echo "configure:5864: checking <ctype> for solaris 2.5.1 " >&5
+echo "configure:5892: checking <ctype> for solaris 2.5.1 " >&5
     cat > conftest.$ac_ext <<EOF
-#line 5866 "configure"
+#line 5894 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -5872,7 +5900,7 @@ int
 	+ __ctype[a];}
 ; return 0; }
 EOF
-if { (eval echo configure:5876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_solaris25=yes
@@ -5892,9 +5920,9 @@ rm -f conftest*
 
         if test $ctype_default = "yes"; then
     echo $ac_n "checking <ctype> for aix ""... $ac_c" 1>&6
-echo "configure:5896: checking <ctype> for aix " >&5
+echo "configure:5924: checking <ctype> for aix " >&5
     cat > conftest.$ac_ext <<EOF
-#line 5898 "configure"
+#line 5926 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -5905,7 +5933,7 @@ int
 	+ _VALC('a') + _IS('c', 0);}
 ; return 0; }
 EOF
-if { (eval echo configure:5909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_aix=yes
@@ -5925,9 +5953,9 @@ rm -f conftest*
 
         if test $ctype_default = "yes"; then
     echo $ac_n "checking <ctype> for newlib ""... $ac_c" 1>&6
-echo "configure:5929: checking <ctype> for newlib " >&5
+echo "configure:5957: checking <ctype> for newlib " >&5
     cat > conftest.$ac_ext <<EOF
-#line 5931 "configure"
+#line 5959 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -5937,7 +5965,7 @@ int
 	+ _ctype_[a];}
 ; return 0; }
 EOF
-if { (eval echo configure:5941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_newlib=yes
@@ -5971,17 +5999,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5975: checking for $ac_hdr" >&5
+echo "configure:6003: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5980 "configure"
+#line 6008 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6010,12 +6038,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6014: checking for $ac_func" >&5
+echo "configure:6042: 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 6019 "configure"
+#line 6047 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6038,7 +6066,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6070: \"$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
@@ -6063,7 +6091,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:6067: checking for working mmap" >&5
+echo "configure:6095: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6071,7 +6099,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6075 "configure"
+#line 6103 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -6211,7 +6239,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:6215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -6274,19 +6302,19 @@ fi
 
 if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:6278: checking for LC_MESSAGES" >&5
+echo "configure:6306: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'ac_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6283 "configure"
+#line 6311 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:6290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_val_LC_MESSAGES=yes
 else
@@ -6538,7 +6566,7 @@ s%@WFMT_FLAGS@%$WFMT_FLAGS%g
 s%@SECTION_FLAGS@%$SECTION_FLAGS%g
 s%@SECTION_LDFLAGS@%$SECTION_LDFLAGS%g
 s%@LIBMATHOBJS@%$LIBMATHOBJS%g
-s%@USE_LONG_DOUBLE@%$USE_LONG_DOUBLE%g
+s%@USE_COMPLEX_LONG_DOUBLE@%$USE_COMPLEX_LONG_DOUBLE%g
 s%@libinst_wstring_la@%$libinst_wstring_la%g
 s%@CANADIAN_TRUE@%$CANADIAN_TRUE%g
 s%@CANADIAN_FALSE@%$CANADIAN_FALSE%g
diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in
index d05a73008ad1a7b242b04a8ccb74edec12c7a55c..b6788625cba8d7ce60d5e947e50ec9223ada7cdd 100644
--- a/libstdc++-v3/configure.in
+++ b/libstdc++-v3/configure.in
@@ -108,10 +108,10 @@ else
 
   GLIBCPP_CHECK_COMPILER_FEATURES
   GLIBCPP_CHECK_LINKER_FEATURES
-  GLIBCPP_CHECK_COMPLEX_SUPPORT
-  GLIBCPP_CHECK_COMPLEX_FLOAT_SUPPORT
   GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT
   GLIBCPP_CHECK_MATH_SUPPORT
+  GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
+  GLIBCPP_CHECK_COMPLEX_MATH_COMPILER_SUPPORT
   GLIBCPP_CHECK_WCHAR_T_SUPPORT
   GLIBCPP_CHECK_CTYPE
 
diff --git a/libstdc++-v3/docs/17_intro/contribute.html b/libstdc++-v3/docs/17_intro/contribute.html
index 961c388d293271d9a5d77dd94d30ac86c95d603a..5aafbdcd5bad578710203faaec6888dfad5160be 100644
--- a/libstdc++-v3/docs/17_intro/contribute.html
+++ b/libstdc++-v3/docs/17_intro/contribute.html
@@ -28,6 +28,12 @@ and their web-site is right
 (And if you've already registered with them, clicking this link will take you to directly to the place where you can 
 <a href="http://webstore.ansi.org/ansidocstore/product.asp?sku=ISO%2FIEC+14882%2D1998">buy the standard on-line.)</a>
 
+<li> The library working group bugs, and known defects, can be obtained at these web sites:
+ <a href="http://www.dkuug.dk/jtc1/sc22/wg21/">http://www.dkuug.dk/jtc1/sc22/wg21 </a>
+ and <a href="http://www.comeaucomputing.com/iso/">http://www.comeaucomputing.com/iso/</a>
+
+<li> The newsgroup dedicated to standardization issues is comp.std.c++: this FAQ for this group is quite useful and can be found <a href="http://reality.sgi.com/austern_mti/std-c++/faq.html"> here </a>.
+
  <li> Peruse the <a href="http://www.gnu.ai.mit.edu/prep/standards_toc.html">GNU Coding Standards</a>, and chuckle when you hit the part about "Using Languages Other Than C." 
 
  <li> Be familiar with the extensions that preceded these general GNU rules. These style issues for libstdc++ can be found in the file C++STYLE, located in the root level of the distribution, or <a href="C++STYLE"> here. </a>
@@ -44,7 +50,7 @@ and their web-site is right
 <p>
 Small changes can be accepted without a copyright assignment form on
 file. New code and additions to the library need completed copyright
-assignment form on file at Cygnus. Note: your employer may be required
+assignment form on file at the FSF. Note: your employer may be required
 to fill out appropriate disclaimer forms as well. Here is the <a href="libstdc++-assign.txt"> form. </a>  
 
 Please contact <a href="mailto:benjamin@cygnus.com">Benjamin
diff --git a/libstdc++-v3/docs/documentation.html b/libstdc++-v3/docs/documentation.html
index 540d934f1215153ad6a77a1d2d2502a054ed6c9c..338fd39e32e288adb2c843a5e93d93035a266f1e 100644
--- a/libstdc++-v3/docs/documentation.html
+++ b/libstdc++-v3/docs/documentation.html
@@ -39,7 +39,7 @@
       <UL>
         <A HREF="configopts.html">Configuring the library</A><BR>
         <A HREF="install.html">Install the library</A><BR>
-        <A HREF="gccrebuild.html">Rebuilding libgcc for namespaces</A><BR>
+        <A HREF="gccrebuild.html">Rebuilding libgcc for ABI-breaking flags</A><BR>
       </UL>
 
 <HR>
diff --git a/libstdc++-v3/docs/gccrebuild.html b/libstdc++-v3/docs/gccrebuild.html
index 8f57884fb2980e90f0571d121dfdb7b11cb1282e..41a8be47a9e3f34e8323a77808bd10d8e4cf8801 100644
--- a/libstdc++-v3/docs/gccrebuild.html
+++ b/libstdc++-v3/docs/gccrebuild.html
@@ -9,12 +9,18 @@
    <TITLE>How to automatically rebuild libgcc.a.</TITLE>
 <LINK REL="home" HREF="http://sourceware.cygnus.com/libstdc++/">
 <LINK REL=StyleSheet HREF="lib3styles.css">
-<!-- $Id: gccrebuild.html,v 1.1 2000/04/21 20:33:30 bkoz Exp $ -->
+<!-- $Id: gccrebuild.html,v 1.2 2000/05/03 16:11:02 pme Exp $ -->
 </HEAD>
 <BODY>
 
 <H2 CLASS="centered"><TT>--enable-libgcc-rebuild</TT></H2>
 
+<P> NOTE: If using the <TT> --enable-libstdcxx-v3</TT> approach to
+    configuring, the std namespace will be turned on for you, without
+    going this route. Only use this flag if you'd like to experiment with
+    yet more binary incompatibilities, as discussed below.
+</P>
+
 <P>If you build libstdc++ using certain flags (e.g., -fnew-abi), then
    programs that use some of the new C++ language features (like namespace
    std and RTTI) will only link if the compiler's libgcc is built using
@@ -22,26 +28,24 @@
    the name mangling algorithm) will have the same effect.
 </P>
 
-<P>Since the compiler and this library are currently separate projects,
-   you would normally have to do this yourself.  Passing
-   --enable-libgcc-rebuild to libstdc++'s configure script means that when
-   you type 'make' next, after libstdc++ is built, then libgcc will also
-   be rebuilt.  If you've given other --enable/--with switches to libstdc++
-   that would require a core library rebuild, then those compiler options
-   will be automatically used when compiling libgcc, such that both
-   libraries will always be built with the same options.
+<P>Passing --enable-libgcc-rebuild to libstdc++'s configure script
+   means that when you type 'make' next, after libstdc++ is built,
+   then libgcc will also be rebuilt.  If you've given other
+   --enable/--with switches to libstdc++ that would require a core
+   library rebuild, then those compiler options will be automatically
+   used when compiling libgcc, such that both libraries will always be
+   built with the same options.
 </P>
 
-<P>Of course, since they are currently separate projects, the libstdc++
-   scripts have no idea where you've built your GCC, so you must tell it.
-   The argument to this enable switch is the path to the GCC build
+<P>The argument to this enable switch is the path to the GCC build
    directory.  The GCC configuration documentation refers to this directory
    as <EM>objdir</EM>; here it will be called <EM>GCCobjdir</EM>.
 </P>
 
-<P>This is a kludge, and will go away eventually.  (In a sense, it has
-   already gone away, as the library sources have been merged into the
-   compiler sources.)
+<P>This is a kludge, and will go away eventually, as more and more of
+   these copiler-level ABI switches get turned on by default.  (In a
+   sense, it has already gone away, as the library sources have been
+   merged into the compiler sources.)
 </P>
 
 <HR>
@@ -114,7 +118,7 @@
 
 <HR>
 <P CLASS="fineprint"><EM>
-$Id: gccrebuild.html,v 1.1 2000/04/21 20:33:30 bkoz Exp $
+$Id: gccrebuild.html,v 1.2 2000/05/03 16:11:02 pme Exp $
 </EM></P>
 
 
diff --git a/libstdc++-v3/docs/install.html b/libstdc++-v3/docs/install.html
index 99c9c532c02ac2c1264365cd599e6f04f7b637ae..8dcf1bb8f1ed0ad4f1c7a96cdc1ab0b2c9bc2fc4 100644
--- a/libstdc++-v3/docs/install.html
+++ b/libstdc++-v3/docs/install.html
@@ -9,7 +9,7 @@
    <TITLE>libstdc++-v3 Installation Instructions</TITLE>
 <LINK REL="home" HREF="http://sourceware.cygnus.com/libstdc++/">
 <LINK REL=StyleSheet HREF="lib3styles.css">
-<!-- $Id: install.html,v 1.11 2000/04/18 22:05:49 pme Exp $ -->
+<!-- $Id: install.html,v 1.1 2000/04/21 20:33:30 bkoz Exp $ -->
 </HEAD>
 <BODY>
 
@@ -60,6 +60,16 @@
       is GNU Make, since it is the only 'make' that will parse these
       makefiles correctly.
    </P>
+
+   <P>As of June 19, 2000, libstdc++ attempts to use tricky and
+   space-saving features of the GNU toolchain, enabled with
+   <TT>-ffunction-sections -fdata-sections -Wl,--gc-sections</TT>. To
+   obtain maximum benefit from this, binutils after this date should
+   also be used (bugs were fixed with c++ exception handling related
+   to this change in libstdc++-v3.) The version of these tools should
+   be: <TT>2.10.90</TT>
+   </P>
+ 
    <P>Finally, if you are using cygwin to compile libstdc++-v3 on
       win32, you'll have to get a version of the cygwin.dll that is
       dated on or after February 1, 2000. This is necessary to
@@ -369,7 +379,7 @@ To rebuild just libstdc++, use:
 Comments and suggestions are welcome, and may be sent to
 <A HREF="mailto:pme@sourceware.cygnus.com">Phil Edwards</A> or
 <A HREF="mailto:gdr@egcs.cygnus.com">Gabriel Dos Reis</A>.
-<BR> $Id: install.html,v 1.11 2000/04/18 22:05:49 pme Exp $
+<BR> $Id: install.html,v 1.1 2000/04/21 20:33:30 bkoz Exp $
 </EM></P>
 
 
diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in
index 94d45bff60df6eeb5e6da660e398d103f6316095..5c721b347a992c7a5f6d4d032b44f4f8c609a580 100644
--- a/libstdc++-v3/libio/Makefile.in
+++ b/libstdc++-v3/libio/Makefile.in
@@ -98,7 +98,7 @@ THREADINCS = @THREADINCS@
 THREADLIBS = @THREADLIBS@
 THREADOBJS = @THREADOBJS@
 THREADSPEC = @THREADSPEC@
-USE_LONG_DOUBLE = @USE_LONG_DOUBLE@
+USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
 VERSION = @VERSION@
 WERROR = @WERROR@
 WFMT_FLAGS = @WFMT_FLAGS@
diff --git a/libstdc++-v3/math/Makefile.am b/libstdc++-v3/math/Makefile.am
index 8b5604a6adbd14538b4f6afb309d71c8e8b73070..6676406325ecb86a1f85e56c86d4ddba410621a6 100644
--- a/libstdc++-v3/math/Makefile.am
+++ b/libstdc++-v3/math/Makefile.am
@@ -42,7 +42,7 @@ EXTRA_DIST = \
 
 libmath_la_LIBADD = \
 	@LIBMATHOBJS@ \
-	$(EXTRA_LONG_DOUBLE_$(USE_LONG_DOUBLE)) 
+	$(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE)) 
 
 libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
 
diff --git a/libstdc++-v3/math/Makefile.in b/libstdc++-v3/math/Makefile.in
index 12899aa0ddb2405874ffdf07f0fa3d1db8d55baf..a00f99ad44998133c9944f3e8e81e40cd26349ca 100644
--- a/libstdc++-v3/math/Makefile.in
+++ b/libstdc++-v3/math/Makefile.in
@@ -98,7 +98,7 @@ THREADINCS = @THREADINCS@
 THREADLIBS = @THREADLIBS@
 THREADOBJS = @THREADOBJS@
 THREADSPEC = @THREADSPEC@
-USE_LONG_DOUBLE = @USE_LONG_DOUBLE@
+USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
 VERSION = @VERSION@
 WERROR = @WERROR@
 WFMT_FLAGS = @WFMT_FLAGS@
@@ -130,7 +130,7 @@ EXTRA_DIST = \
 
 libmath_la_LIBADD = \
 	@LIBMATHOBJS@ \
-	$(EXTRA_LONG_DOUBLE_$(USE_LONG_DOUBLE)) 
+	$(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE)) 
 
 
 libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 41825ef76fc841510c2239bbf7c0fbd11f6e37d1..01d587f5cb3a2725933a63ba5a29f808645d1b35 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -96,7 +96,7 @@ THREADINCS = @THREADINCS@
 THREADLIBS = @THREADLIBS@
 THREADOBJS = @THREADOBJS@
 THREADSPEC = @THREADSPEC@
-USE_LONG_DOUBLE = @USE_LONG_DOUBLE@
+USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
 VERSION = @VERSION@
 WERROR = @WERROR@
 WFMT_FLAGS = @WFMT_FLAGS@