[multiple changes]

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

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

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

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

From-SVN: r34608

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

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

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

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index ddf533a..bfc4d27 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -2917,11 +2917,16 @@ echo "configure:2914: checking for ld that supports -Wl,--gc-sections" >&5
 #include "confdefs.h"
 
 int main() {
-int foo;
+
+   try
+     {
+       throw 1;
+     }
+   catch (...) {};
   
 ; return 0; }
 EOF
-if { (eval echo configure:2925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_sectionLDflags=yes
 else
@@ -2961,16 +2966,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:2965: checking for __builtin_acos" >&5
+echo "configure:2970: checking for __builtin_acos" >&5
   cat > conftest.$ac_ext <<EOF
-#line 2967 "configure"
+#line 2972 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_acos(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:2974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_acos=yes
 else
@@ -2988,16 +2993,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_acosf""... $ac_c" 1>&6
-echo "configure:2992: checking for __builtin_acosf" >&5
+echo "configure:2997: checking for __builtin_acosf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 2994 "configure"
+#line 2999 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_acosf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_acosf=yes
 else
@@ -3015,16 +3020,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_acosl""... $ac_c" 1>&6
-echo "configure:3019: checking for __builtin_acosl" >&5
+echo "configure:3024: checking for __builtin_acosl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3021 "configure"
+#line 3026 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_acosl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_acosl=yes
 else
@@ -3042,16 +3047,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_asin""... $ac_c" 1>&6
-echo "configure:3046: checking for __builtin_asin" >&5
+echo "configure:3051: checking for __builtin_asin" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3048 "configure"
+#line 3053 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_asin(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_asin=yes
 else
@@ -3069,16 +3074,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_asinf""... $ac_c" 1>&6
-echo "configure:3073: checking for __builtin_asinf" >&5
+echo "configure:3078: checking for __builtin_asinf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3075 "configure"
+#line 3080 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_asinf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_asinf=yes
 else
@@ -3096,16 +3101,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_asinl""... $ac_c" 1>&6
-echo "configure:3100: checking for __builtin_asinl" >&5
+echo "configure:3105: checking for __builtin_asinl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3102 "configure"
+#line 3107 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_asinl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_asinl=yes
 else
@@ -3123,16 +3128,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_atan""... $ac_c" 1>&6
-echo "configure:3127: checking for __builtin_atan" >&5
+echo "configure:3132: checking for __builtin_atan" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3129 "configure"
+#line 3134 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_atan(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_atan=yes
 else
@@ -3150,16 +3155,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_atanf""... $ac_c" 1>&6
-echo "configure:3154: checking for __builtin_atanf" >&5
+echo "configure:3159: checking for __builtin_atanf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3156 "configure"
+#line 3161 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_atanf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_atanf=yes
 else
@@ -3177,16 +3182,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_atanl""... $ac_c" 1>&6
-echo "configure:3181: checking for __builtin_atanl" >&5
+echo "configure:3186: checking for __builtin_atanl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3183 "configure"
+#line 3188 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_atanl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_atanl=yes
 else
@@ -3204,16 +3209,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_atan2""... $ac_c" 1>&6
-echo "configure:3208: checking for __builtin_atan2" >&5
+echo "configure:3213: checking for __builtin_atan2" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3210 "configure"
+#line 3215 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_atan2(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_atan2=yes
 else
@@ -3231,16 +3236,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_atan2f""... $ac_c" 1>&6
-echo "configure:3235: checking for __builtin_atan2f" >&5
+echo "configure:3240: checking for __builtin_atan2f" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3237 "configure"
+#line 3242 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_atan2f(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_atan2f=yes
 else
@@ -3258,16 +3263,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_atan2l""... $ac_c" 1>&6
-echo "configure:3262: checking for __builtin_atan2l" >&5
+echo "configure:3267: checking for __builtin_atan2l" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3264 "configure"
+#line 3269 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_atan2l(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_atan2l=yes
 else
@@ -3285,16 +3290,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_ceil""... $ac_c" 1>&6
-echo "configure:3289: checking for __builtin_ceil" >&5
+echo "configure:3294: checking for __builtin_ceil" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3291 "configure"
+#line 3296 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_fceil(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_ceil=yes
 else
@@ -3312,16 +3317,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_ceilf""... $ac_c" 1>&6
-echo "configure:3316: checking for __builtin_ceilf" >&5
+echo "configure:3321: checking for __builtin_ceilf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3318 "configure"
+#line 3323 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_ceilf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_ceilf=yes
 else
@@ -3339,16 +3344,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_ceill""... $ac_c" 1>&6
-echo "configure:3343: checking for __builtin_ceill" >&5
+echo "configure:3348: checking for __builtin_ceill" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3345 "configure"
+#line 3350 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_ceill(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_ceill=yes
 else
@@ -3366,16 +3371,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_cos""... $ac_c" 1>&6
-echo "configure:3370: checking for __builtin_cos" >&5
+echo "configure:3375: checking for __builtin_cos" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3372 "configure"
+#line 3377 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_cos(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_cos=yes
 else
@@ -3393,16 +3398,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_cosf""... $ac_c" 1>&6
-echo "configure:3397: checking for __builtin_cosf" >&5
+echo "configure:3402: checking for __builtin_cosf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3399 "configure"
+#line 3404 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_cosf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_cosf=yes
 else
@@ -3420,16 +3425,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_cosl""... $ac_c" 1>&6
-echo "configure:3424: checking for __builtin_cosl" >&5
+echo "configure:3429: checking for __builtin_cosl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3426 "configure"
+#line 3431 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_cosl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_cosl=yes
 else
@@ -3447,16 +3452,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_cosh""... $ac_c" 1>&6
-echo "configure:3451: checking for __builtin_cosh" >&5
+echo "configure:3456: checking for __builtin_cosh" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3453 "configure"
+#line 3458 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_cosh(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_cosh=yes
 else
@@ -3474,16 +3479,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_coshf""... $ac_c" 1>&6
-echo "configure:3478: checking for __builtin_coshf" >&5
+echo "configure:3483: checking for __builtin_coshf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3480 "configure"
+#line 3485 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_coshf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_coshf=yes
 else
@@ -3501,16 +3506,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_coshl""... $ac_c" 1>&6
-echo "configure:3505: checking for __builtin_coshl" >&5
+echo "configure:3510: checking for __builtin_coshl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3507 "configure"
+#line 3512 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_coshl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_coshl=yes
 else
@@ -3528,16 +3533,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_exp""... $ac_c" 1>&6
-echo "configure:3532: checking for __builtin_exp" >&5
+echo "configure:3537: checking for __builtin_exp" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3534 "configure"
+#line 3539 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_exp(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_exp=yes
 else
@@ -3555,16 +3560,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_expf""... $ac_c" 1>&6
-echo "configure:3559: checking for __builtin_expf" >&5
+echo "configure:3564: checking for __builtin_expf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3561 "configure"
+#line 3566 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_expf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_expf=yes
 else
@@ -3582,16 +3587,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_expl""... $ac_c" 1>&6
-echo "configure:3586: checking for __builtin_expl" >&5
+echo "configure:3591: checking for __builtin_expl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3588 "configure"
+#line 3593 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_expl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_expl=yes
 else
@@ -3609,16 +3614,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_fabs""... $ac_c" 1>&6
-echo "configure:3613: checking for __builtin_fabs" >&5
+echo "configure:3618: checking for __builtin_fabs" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3615 "configure"
+#line 3620 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_fabs(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_fabs=yes
 else
@@ -3636,16 +3641,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_fabsf""... $ac_c" 1>&6
-echo "configure:3640: checking for __builtin_fabsf" >&5
+echo "configure:3645: checking for __builtin_fabsf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3642 "configure"
+#line 3647 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_fabsf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_fabsf=yes
 else
@@ -3663,16 +3668,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_fabsl""... $ac_c" 1>&6
-echo "configure:3667: checking for __builtin_fabsl" >&5
+echo "configure:3672: checking for __builtin_fabsl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3669 "configure"
+#line 3674 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_fabsl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_fabsl=yes
 else
@@ -3690,16 +3695,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_floor""... $ac_c" 1>&6
-echo "configure:3694: checking for __builtin_floor" >&5
+echo "configure:3699: checking for __builtin_floor" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3696 "configure"
+#line 3701 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_floor(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_floor=yes
 else
@@ -3717,16 +3722,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_floorf""... $ac_c" 1>&6
-echo "configure:3721: checking for __builtin_floorf" >&5
+echo "configure:3726: checking for __builtin_floorf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3723 "configure"
+#line 3728 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_floorf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_floorf=yes
 else
@@ -3744,16 +3749,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_floorl""... $ac_c" 1>&6
-echo "configure:3748: checking for __builtin_floorl" >&5
+echo "configure:3753: checking for __builtin_floorl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3750 "configure"
+#line 3755 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_floorl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_floorl=yes
 else
@@ -3771,16 +3776,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_fmod""... $ac_c" 1>&6
-echo "configure:3775: checking for __builtin_fmod" >&5
+echo "configure:3780: checking for __builtin_fmod" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3777 "configure"
+#line 3782 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_fmod(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_fmod=yes
 else
@@ -3798,16 +3803,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_fmodf""... $ac_c" 1>&6
-echo "configure:3802: checking for __builtin_fmodf" >&5
+echo "configure:3807: checking for __builtin_fmodf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3804 "configure"
+#line 3809 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_fmodf(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_fmodf=yes
 else
@@ -3825,16 +3830,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_fmodl""... $ac_c" 1>&6
-echo "configure:3829: checking for __builtin_fmodl" >&5
+echo "configure:3834: checking for __builtin_fmodl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3831 "configure"
+#line 3836 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_fmodl(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:3838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_fmodl=yes
 else
@@ -3852,16 +3857,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_frexp""... $ac_c" 1>&6
-echo "configure:3856: checking for __builtin_frexp" >&5
+echo "configure:3861: checking for __builtin_frexp" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3858 "configure"
+#line 3863 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_frexp(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:3865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_frexp=yes
 else
@@ -3879,16 +3884,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_frexpf""... $ac_c" 1>&6
-echo "configure:3883: checking for __builtin_frexpf" >&5
+echo "configure:3888: checking for __builtin_frexpf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3885 "configure"
+#line 3890 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_frexpf(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:3892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_frexpf=yes
 else
@@ -3906,16 +3911,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_frexpl""... $ac_c" 1>&6
-echo "configure:3910: checking for __builtin_frexpl" >&5
+echo "configure:3915: checking for __builtin_frexpl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3912 "configure"
+#line 3917 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_frexpl(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:3919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_frexpl=yes
 else
@@ -3933,16 +3938,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_ldexp""... $ac_c" 1>&6
-echo "configure:3937: checking for __builtin_ldexp" >&5
+echo "configure:3942: checking for __builtin_ldexp" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3939 "configure"
+#line 3944 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_ldexp(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:3946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_ldexp=yes
 else
@@ -3960,16 +3965,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_ldexpf""... $ac_c" 1>&6
-echo "configure:3964: checking for __builtin_ldexpf" >&5
+echo "configure:3969: checking for __builtin_ldexpf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3966 "configure"
+#line 3971 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_ldexpf(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:3973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_ldexpf=yes
 else
@@ -3987,16 +3992,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_ldexpl""... $ac_c" 1>&6
-echo "configure:3991: checking for __builtin_ldexpl" >&5
+echo "configure:3996: checking for __builtin_ldexpl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 3993 "configure"
+#line 3998 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_ldexpl(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:4000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_ldexpl=yes
 else
@@ -4014,16 +4019,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_log""... $ac_c" 1>&6
-echo "configure:4018: checking for __builtin_log" >&5
+echo "configure:4023: checking for __builtin_log" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4020 "configure"
+#line 4025 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_log(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_log=yes
 else
@@ -4041,16 +4046,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_logf""... $ac_c" 1>&6
-echo "configure:4045: checking for __builtin_logf" >&5
+echo "configure:4050: checking for __builtin_logf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4047 "configure"
+#line 4052 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_logf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_logf=yes
 else
@@ -4068,16 +4073,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_logl""... $ac_c" 1>&6
-echo "configure:4072: checking for __builtin_logl" >&5
+echo "configure:4077: checking for __builtin_logl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4074 "configure"
+#line 4079 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_logl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_logl=yes
 else
@@ -4095,16 +4100,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_log10""... $ac_c" 1>&6
-echo "configure:4099: checking for __builtin_log10" >&5
+echo "configure:4104: checking for __builtin_log10" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4101 "configure"
+#line 4106 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_log10(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_log10=yes
 else
@@ -4122,16 +4127,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_log10f""... $ac_c" 1>&6
-echo "configure:4126: checking for __builtin_log10f" >&5
+echo "configure:4131: checking for __builtin_log10f" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4128 "configure"
+#line 4133 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_log10f(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_log10f=yes
 else
@@ -4149,16 +4154,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_log10l""... $ac_c" 1>&6
-echo "configure:4153: checking for __builtin_log10l" >&5
+echo "configure:4158: checking for __builtin_log10l" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4155 "configure"
+#line 4160 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_log10l(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_log10l=yes
 else
@@ -4176,16 +4181,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_modf""... $ac_c" 1>&6
-echo "configure:4180: checking for __builtin_modf" >&5
+echo "configure:4185: checking for __builtin_modf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4182 "configure"
+#line 4187 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_modf(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:4189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_modf=yes
 else
@@ -4203,16 +4208,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_modff""... $ac_c" 1>&6
-echo "configure:4207: checking for __builtin_modff" >&5
+echo "configure:4212: checking for __builtin_modff" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4209 "configure"
+#line 4214 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_modff(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:4216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_modff=yes
 else
@@ -4230,16 +4235,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_modfl""... $ac_c" 1>&6
-echo "configure:4234: checking for __builtin_modfl" >&5
+echo "configure:4239: checking for __builtin_modfl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4236 "configure"
+#line 4241 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_modfl(0.0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:4243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_modfl=yes
 else
@@ -4257,16 +4262,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_pow""... $ac_c" 1>&6
-echo "configure:4261: checking for __builtin_pow" >&5
+echo "configure:4266: checking for __builtin_pow" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4263 "configure"
+#line 4268 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_pow(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4270: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_pow=yes
 else
@@ -4284,16 +4289,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_powf""... $ac_c" 1>&6
-echo "configure:4288: checking for __builtin_powf" >&5
+echo "configure:4293: checking for __builtin_powf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4290 "configure"
+#line 4295 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_powf(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_powf=yes
 else
@@ -4311,16 +4316,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_powl""... $ac_c" 1>&6
-echo "configure:4315: checking for __builtin_powl" >&5
+echo "configure:4320: checking for __builtin_powl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4317 "configure"
+#line 4322 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_powl(0.0, 0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_powl=yes
 else
@@ -4338,16 +4343,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sin""... $ac_c" 1>&6
-echo "configure:4342: checking for __builtin_sin" >&5
+echo "configure:4347: checking for __builtin_sin" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4344 "configure"
+#line 4349 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_sin(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sin=yes
 else
@@ -4365,16 +4370,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sinf""... $ac_c" 1>&6
-echo "configure:4369: checking for __builtin_sinf" >&5
+echo "configure:4374: checking for __builtin_sinf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4371 "configure"
+#line 4376 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_sinf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sinf=yes
 else
@@ -4392,16 +4397,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sinl""... $ac_c" 1>&6
-echo "configure:4396: checking for __builtin_sinl" >&5
+echo "configure:4401: checking for __builtin_sinl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4398 "configure"
+#line 4403 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_sinl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sinl=yes
 else
@@ -4419,16 +4424,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sinh""... $ac_c" 1>&6
-echo "configure:4423: checking for __builtin_sinh" >&5
+echo "configure:4428: checking for __builtin_sinh" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4425 "configure"
+#line 4430 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_sinh(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sinh=yes
 else
@@ -4446,16 +4451,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sinhf""... $ac_c" 1>&6
-echo "configure:4450: checking for __builtin_sinhf" >&5
+echo "configure:4455: checking for __builtin_sinhf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4452 "configure"
+#line 4457 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_sinhf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sinhf=yes
 else
@@ -4473,16 +4478,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sinhl""... $ac_c" 1>&6
-echo "configure:4477: checking for __builtin_sinhl" >&5
+echo "configure:4482: checking for __builtin_sinhl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4479 "configure"
+#line 4484 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_sinhl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sinhl=yes
 else
@@ -4500,16 +4505,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sqrt""... $ac_c" 1>&6
-echo "configure:4504: checking for __builtin_sqrt" >&5
+echo "configure:4509: checking for __builtin_sqrt" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4506 "configure"
+#line 4511 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_fsqrt(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sqrt=yes
 else
@@ -4527,16 +4532,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sqrtf""... $ac_c" 1>&6
-echo "configure:4531: checking for __builtin_sqrtf" >&5
+echo "configure:4536: checking for __builtin_sqrtf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4533 "configure"
+#line 4538 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_sqrtf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sqrtf=yes
 else
@@ -4554,16 +4559,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_sqrtl""... $ac_c" 1>&6
-echo "configure:4558: checking for __builtin_sqrtl" >&5
+echo "configure:4563: checking for __builtin_sqrtl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4560 "configure"
+#line 4565 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_sqrtl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_sqrtl=yes
 else
@@ -4581,16 +4586,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_tan""... $ac_c" 1>&6
-echo "configure:4585: checking for __builtin_tan" >&5
+echo "configure:4590: checking for __builtin_tan" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4587 "configure"
+#line 4592 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_tan(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_tan=yes
 else
@@ -4608,16 +4613,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_tanf""... $ac_c" 1>&6
-echo "configure:4612: checking for __builtin_tanf" >&5
+echo "configure:4617: checking for __builtin_tanf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4614 "configure"
+#line 4619 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_tanf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_tanf=yes
 else
@@ -4635,16 +4640,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_tanl""... $ac_c" 1>&6
-echo "configure:4639: checking for __builtin_tanl" >&5
+echo "configure:4644: checking for __builtin_tanl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4641 "configure"
+#line 4646 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_tanl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_tanl=yes
 else
@@ -4662,16 +4667,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_tanh""... $ac_c" 1>&6
-echo "configure:4666: checking for __builtin_tanh" >&5
+echo "configure:4671: checking for __builtin_tanh" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4668 "configure"
+#line 4673 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_tanh(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_tanh=yes
 else
@@ -4689,16 +4694,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_tanhf""... $ac_c" 1>&6
-echo "configure:4693: checking for __builtin_tanhf" >&5
+echo "configure:4698: checking for __builtin_tanhf" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4695 "configure"
+#line 4700 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_tanhf(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4702: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_tanhf=yes
 else
@@ -4716,16 +4721,16 @@ EOF
 
   fi
   echo $ac_n "checking for __builtin_tanhl""... $ac_c" 1>&6
-echo "configure:4720: checking for __builtin_tanhl" >&5
+echo "configure:4725: checking for __builtin_tanhl" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4722 "configure"
+#line 4727 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
  __builtin_tanhl(0.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_builtin_tanhl=yes
 else
@@ -4751,17 +4756,13 @@ 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
 
+          ac_test_CFLAGS="${CFLAGS+set}"
+  ac_save_CFLAGS="$CFLAGS"
+  CFLAGS='-x c++'
 
-  echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4765: checking for sin in -lm" >&5
+    echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
+echo "configure:4766: 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
@@ -4769,12 +4770,9 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4773 "configure"
+#line 4774 "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();
@@ -4783,7 +4781,7 @@ int main() {
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4785: \"$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
@@ -4809,20 +4807,17 @@ fi
     for ac_func in cosf fabsf sinf sqrtf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4813: checking for $ac_func" >&5
+echo "configure:4811: 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 4818 "configure"
+#line 4816 "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();
@@ -4840,7 +4835,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4839: \"$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
@@ -4874,20 +4869,17 @@ done
   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
+echo "configure:4873: 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 4883 "configure"
+#line 4878 "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();
@@ -4905,7 +4897,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4901: \"$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
@@ -4944,20 +4936,17 @@ done
   _sincosl _finite _finitef _finitel _fqfinite _fpclass _qfpclass
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4948: checking for $ac_func" >&5
+echo "configure:4940: 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 4953 "configure"
+#line 4945 "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();
@@ -4975,7 +4964,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4968: \"$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
@@ -5001,30 +4990,24 @@ 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
-
+  CFLAGS="$ac_save_CFLAGS"
 
   
     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
+echo "configure:5001: 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"
+#line 5006 "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; }
+{ (eval echo configure:5011: \"$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*
@@ -5056,12 +5039,12 @@ done
   carg cargf nan hypot hypotf atan2f expf copysignf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5060: checking for $ac_func" >&5
+echo "configure:5043: 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 5065 "configure"
+#line 5048 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5084,7 +5067,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5071: \"$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
@@ -5113,12 +5096,12 @@ done
 
       USE_LONG_DOUBLE=no
   echo $ac_n "checking for copysignl""... $ac_c" 1>&6
-echo "configure:5117: checking for copysignl" >&5
+echo "configure:5100: 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 5122 "configure"
+#line 5105 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char copysignl(); below.  */
@@ -5141,7 +5124,7 @@ copysignl();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_copysignl=yes"
 else
@@ -5160,12 +5143,12 @@ if eval "test \"`echo '$ac_cv_func_'copysignl`\" = yes"; then
   csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5164: checking for $ac_func" >&5
+echo "configure:5147: 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 5169 "configure"
+#line 5152 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5188,7 +5171,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5175: \"$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
@@ -5224,7 +5207,7 @@ fi
   
 
   echo $ac_n "checking for GNU C++ __complex__ support""... $ac_c" 1>&6
-echo "configure:5228: checking for GNU C++ __complex__ support" >&5
+echo "configure:5211: 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
@@ -5238,7 +5221,7 @@ 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 5242 "configure"
+#line 5225 "configure"
 #include "confdefs.h"
 struct dcomplex { __complex__ double x; }; \
                    dcomplex f(const dcomplex& x) { return dcomplex(x); }
@@ -5247,7 +5230,7 @@ int main() {
                     dcomplex x; f(x); 
 ; return 0; }
 EOF
-if { (eval echo configure:5251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_complex=ok
 else
@@ -5277,7 +5260,7 @@ 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
+echo "configure:5264: 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
@@ -5310,14 +5293,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
       };
 EOB
     cat > conftest.$ac_ext <<EOF
-#line 5314 "configure"
+#line 5297 "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
+if { (eval echo configure:5304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcpp_cv_float_complex=ok
 else
@@ -5350,17 +5333,17 @@ EOF
 
     ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
-echo "configure:5354: checking for wchar.h" >&5
+echo "configure:5337: 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 5359 "configure"
+#line 5342 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5347: \"$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*
@@ -5384,17 +5367,17 @@ fi
 
   ac_safe=`echo "wctype.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wctype.h""... $ac_c" 1>&6
-echo "configure:5388: checking for wctype.h" >&5
+echo "configure:5371: 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 5393 "configure"
+#line 5376 "configure"
 #include "confdefs.h"
 #include <wctype.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5381: \"$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*
@@ -5420,16 +5403,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:5424: checking for mbstate_t" >&5
+echo "configure:5407: checking for mbstate_t" >&5
     cat > conftest.$ac_ext <<EOF
-#line 5426 "configure"
+#line 5409 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 int main() {
 mbstate_t teststate;
 ; return 0; }
 EOF
-if { (eval echo configure:5433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_native_mbstatet=yes
 else
@@ -5448,16 +5431,16 @@ EOF
     fi
   
             echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6
-echo "configure:5452: checking for WCHAR_MIN and WCHAR_MAX" >&5
+echo "configure:5435: checking for WCHAR_MIN and WCHAR_MAX" >&5
     cat > conftest.$ac_ext <<EOF
-#line 5454 "configure"
+#line 5437 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 int main() {
 int i = WCHAR_MIN; int j = WCHAR_MAX;
 ; return 0; }
 EOF
-if { (eval echo configure:5461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   has_wchar_minmax=yes
 else
@@ -5470,9 +5453,9 @@ rm -f conftest*
     echo "$ac_t""$has_wchar_minmax" 1>&6
   
             echo $ac_n "checking for WEOF""... $ac_c" 1>&6
-echo "configure:5474: checking for WEOF" >&5
+echo "configure:5457: checking for WEOF" >&5
     cat > conftest.$ac_ext <<EOF
-#line 5476 "configure"
+#line 5459 "configure"
 #include "confdefs.h"
 
       #include <wchar.h>
@@ -5481,7 +5464,7 @@ int main() {
 wint_t i = WEOF;
 ; return 0; }
 EOF
-if { (eval echo configure:5485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   has_weof=yes
 else
@@ -5496,12 +5479,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:5500: checking for $ac_func" >&5
+echo "configure:5483: 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 5505 "configure"
+#line 5488 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5524,7 +5507,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5511: \"$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
@@ -5551,7 +5534,7 @@ done
 
 
     echo $ac_n "checking for ISO C9X wchar_t support""... $ac_c" 1>&6
-echo "configure:5555: checking for ISO C9X wchar_t support" >&5
+echo "configure:5538: 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
@@ -5561,17 +5544,17 @@ echo "configure:5555: 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:5565: checking for iconv.h" >&5
+echo "configure:5548: 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 5570 "configure"
+#line 5553 "configure"
 #include "confdefs.h"
 #include <iconv.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5558: \"$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*
@@ -5596,12 +5579,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:5600: checking for $ac_func" >&5
+echo "configure:5583: 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 5605 "configure"
+#line 5588 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5624,7 +5607,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5611: \"$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
@@ -5651,7 +5634,7 @@ done
 
 
     echo $ac_n "checking for XPG2 wchar_t support""... $ac_c" 1>&6
-echo "configure:5655: checking for XPG2 wchar_t support" >&5
+echo "configure:5638: 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
@@ -5660,7 +5643,7 @@ echo "configure:5655: 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:5664: checking for enabled wchar_t specializations" >&5
+echo "configure:5647: 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
@@ -5685,17 +5668,17 @@ EOF
   
   ac_safe=`echo "ctype.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ctype.h""... $ac_c" 1>&6
-echo "configure:5689: checking for ctype.h" >&5
+echo "configure:5672: 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 5694 "configure"
+#line 5677 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5682: \"$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*
@@ -5716,9 +5699,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:5720: checking <ctype> for gnu-linux " >&5
+echo "configure:5703: checking <ctype> for gnu-linux " >&5
     cat > conftest.$ac_ext <<EOF
-#line 5722 "configure"
+#line 5705 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -5729,7 +5712,7 @@ int
        + __ctype_tolower[a] + __ctype_toupper[a] + __ctype_b[a];}
 ; return 0; }
 EOF
-if { (eval echo configure:5733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_linux=yes
@@ -5748,9 +5731,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:5752: checking <ctype> for freebsd 4.0 " >&5
+echo "configure:5735: checking <ctype> for freebsd 4.0 " >&5
     cat > conftest.$ac_ext <<EOF
-#line 5754 "configure"
+#line 5737 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -5760,7 +5743,7 @@ int
        + _CTYPE_D + _CTYPE_P + _CTYPE_X + _CTYPE_G ;}
 ; return 0; }
 EOF
-if { (eval echo configure:5764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_bsd=yes
@@ -5780,9 +5763,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:5784: checking <ctype> for freebsd 3.4 " >&5
+echo "configure:5767: checking <ctype> for freebsd 3.4 " >&5
     cat > conftest.$ac_ext <<EOF
-#line 5786 "configure"
+#line 5769 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -5792,7 +5775,7 @@ int
       + _D + _P + _X + _G + __istype (a, 0);}
 ; return 0; }
 EOF
-if { (eval echo configure:5796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_freebsd34=yes
@@ -5812,9 +5795,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:5816: checking <ctype> for solaris 2.6,7,8 " >&5
+echo "configure:5799: checking <ctype> for solaris 2.6,7,8 " >&5
     cat > conftest.$ac_ext <<EOF
-#line 5818 "configure"
+#line 5801 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -5825,7 +5808,7 @@ int
        + __trans_lower[a] + __trans_upper[a] + __ctype_mask[a];}
 ; return 0; }
 EOF
-if { (eval echo configure:5829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_solaris=yes
@@ -5840,7 +5823,7 @@ rm -f conftest*
 
     if test $ctype_solaris = "yes"; then
       echo $ac_n "checking   for version""... $ac_c" 1>&6
-echo "configure:5844: checking   for version" >&5
+echo "configure:5827: 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'
@@ -5849,14 +5832,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 5853 "configure"
+#line 5836 "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:5860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
       ctype_solaris26=yes
@@ -5888,9 +5871,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:5892: checking <ctype> for solaris 2.5.1 " >&5
+echo "configure:5875: checking <ctype> for solaris 2.5.1 " >&5
     cat > conftest.$ac_ext <<EOF
-#line 5894 "configure"
+#line 5877 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -5900,7 +5883,7 @@ int
        + __ctype[a];}
 ; return 0; }
 EOF
-if { (eval echo configure:5904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_solaris25=yes
@@ -5920,9 +5903,9 @@ rm -f conftest*
 
         if test $ctype_default = "yes"; then
     echo $ac_n "checking <ctype> for aix ""... $ac_c" 1>&6
-echo "configure:5924: checking <ctype> for aix " >&5
+echo "configure:5907: checking <ctype> for aix " >&5
     cat > conftest.$ac_ext <<EOF
-#line 5926 "configure"
+#line 5909 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -5933,7 +5916,7 @@ int
        + _VALC('a') + _IS('c', 0);}
 ; return 0; }
 EOF
-if { (eval echo configure:5937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_aix=yes
@@ -5953,9 +5936,9 @@ rm -f conftest*
 
         if test $ctype_default = "yes"; then
     echo $ac_n "checking <ctype> for newlib ""... $ac_c" 1>&6
-echo "configure:5957: checking <ctype> for newlib " >&5
+echo "configure:5940: checking <ctype> for newlib " >&5
     cat > conftest.$ac_ext <<EOF
-#line 5959 "configure"
+#line 5942 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 int main() {
@@ -5965,7 +5948,7 @@ int
        + _ctype_[a];}
 ; return 0; }
 EOF
-if { (eval echo configure:5969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   \
     ctype_newlib=yes
@@ -5999,17 +5982,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6003: checking for $ac_hdr" >&5
+echo "configure:5986: 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 6008 "configure"
+#line 5991 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5996: \"$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*
@@ -6038,12 +6021,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6042: checking for $ac_func" >&5
+echo "configure:6025: 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 6047 "configure"
+#line 6030 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6066,7 +6049,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6053: \"$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
@@ -6091,7 +6074,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:6095: checking for working mmap" >&5
+echo "configure:6078: 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
@@ -6099,7 +6082,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6103 "configure"
+#line 6086 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -6239,7 +6222,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:6243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6226: \"$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
@@ -6302,19 +6285,19 @@ fi
 
 if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:6306: checking for LC_MESSAGES" >&5
+echo "configure:6289: 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 6311 "configure"
+#line 6294 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:6318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6301: \"$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

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 1435072..2b65465 100644 (file)
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -45,7 +45,7 @@ EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
 # or configure.in to see how they are set.
 # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
 AC_CXXFLAGS = \
-       @WERROR@ @WFMT_FLAGS@ @CPU_FLAGS@ @EXTRA_CXX_FLAGS@ \
+       $(WERROR) @WFMT_FLAGS@ @CPU_FLAGS@ @EXTRA_CXX_FLAGS@ \
        @SECTION_FLAGS@ @SECTION_LDFLAGS@ @DEBUG_FLAGS@ 
 
 # Need to manually set this option because AC_CXXFLAGS has to be at

diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 01d587f..70cbeea 100644 (file)
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -125,7 +125,7 @@ EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
 # or configure.in to see how they are set.
 # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
 AC_CXXFLAGS = \
-       @WERROR@ @WFMT_FLAGS@ @CPU_FLAGS@ @EXTRA_CXX_FLAGS@ \
+       $(WERROR) @WFMT_FLAGS@ @CPU_FLAGS@ @EXTRA_CXX_FLAGS@ \
        @SECTION_FLAGS@ @SECTION_LDFLAGS@ @DEBUG_FLAGS@