diff options
-rw-r--r-- | libstdc++-v3/ChangeLog | 10 | ||||
-rw-r--r-- | libstdc++-v3/acinclude.m4 | 32 | ||||
-rw-r--r-- | libstdc++-v3/aclocal.m4 | 32 | ||||
-rwxr-xr-x | libstdc++-v3/configure | 247 | ||||
-rw-r--r-- | libstdc++-v3/configure.in | 9 |
5 files changed, 174 insertions, 156 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2a771ef..ff0be9b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2000-05-18 Benjamin Kosnik <bkoz@gnu.org> + + * acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Change to + --enable-cshadow-headers. Add output messages. + (GCC_ENABLE_LONG_LONG): Change to --enable-long-long, no + underscores (like the rest of the enable options.) Add output messages. + * aclocal.m4: Regenerate. + * configure: Regenerate. + * configure.in: Touch. + 2000-05-17 Benjamin Kosnik <bkoz@cygnus.com> * mkcheck.in: Enable shared library testing. diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 25109dd..77ecbc6 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -910,9 +910,10 @@ dnl dnl GLIBCPP_ENABLE_LONG_LONG AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl define([GLIBCPP_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl + AC_MSG_CHECKING([for enabled long long]) AC_ARG_ENABLE(long-long, changequote(<<, >>)dnl - <<--enable-long_long turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT], + <<--enable-long-long turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT], changequote([, ])dnl [case "$enableval" in yes) enable_long_long=yes ;; @@ -920,6 +921,7 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl *) AC_MSG_ERROR([Unknown argument to enable/disable long long]) ;; esac], enable_long_long=GLIBCPP_ENABLE_LONG_LONG_DEFAULT)dnl + AC_MSG_RESULT($enable_long_long) dnl Option parsed, now set things appropriately case "$enable_long_long" in yes) AC_DEFINE(_GLIBCPP_USE_LONG_LONG) @@ -932,29 +934,35 @@ dnl dnl Check for certain special build configurations. dnl dnl GLIBCPP_ENABLE_SHADOW -dnl --enable-shadow-headers [does stuff]. -dnl --disable-shadow-headers [does not do stuff]. +dnl --enable-cshadow-headers [does stuff]. +dnl --disable-cshadow-headers [does not do stuff]. dnl + This will eventually need to be on by default. dnl + Usage: GLIBCPP_ENABLE_SHADOW[(DEFAULT)] dnl Where DEFAULT is either `yes' or `no'. If ommitted, it dnl defaults to `no'. AC_DEFUN(GLIBCPP_ENABLE_SHADOW, [dnl define([GLIBCPP_ENABLE_SHADOW_DEFAULT], ifelse($1, yes, yes, no))dnl -AC_ARG_ENABLE(shadow-headers, +AC_MSG_CHECKING([for enabled cshadow headers]) +AC_ARG_ENABLE(cshadow-headers, changequote(<<, >>)dnl -<< --enable-shadow-headers construct "shadowed" C header files for - g++ [default=>>GLIBCPP_ENABLE_SHADOW_DEFAULT], +<< --enable-cshadow-headers construct "shadowed" C header files for + g++ [default=>>GLIBCPP_ENABLE_SHADOW_DEFAULT], changequote([, ])dnl [case "$enableval" in - yes) enable_shadow_headers=yes ;; - no) enable_shadow_headers=no ;; - *) AC_MSG_ERROR([Unknown argument to enable/disable shadowed C headers]) ;; + yes) enable_cshadow_headers=yes + ;; + no) enable_cshadow_headers=no + ;; + *) AC_MSG_ERROR([Unknown argument to enable/disable shadowed C headers]) + ;; esac], -enable_shadow_headers=GLIBCPP_ENABLE_SHADOW_DEFAULT)dnl +enable_cshadow_headers=GLIBCPP_ENABLE_SHADOW_DEFAULT)dnl +AC_MSG_RESULT($enable_cshadow_headers) dnl Option parsed, now set things appropriately -case "$enable_shadow_headers" in +case "$enable_cshadow_headers" in yes) - SHADOW_INCLUDES="-I -am -the -walrus" + SHADOW_INCLUDES="-I$srcdir/shadow -I$blddir/cshadow" +$srcdir/inclosure "-I $blddir/../../gcc/include/ -I /usr/include/ -G machine/ansi.h" | $srcdir/mkcshadow ;; no) SHADOW_INCLUDES='' diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 74d8681..d4b3816 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -922,9 +922,10 @@ dnl dnl GLIBCPP_ENABLE_LONG_LONG AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl define([GLIBCPP_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl + AC_MSG_CHECKING([for enabled long long]) AC_ARG_ENABLE(long-long, changequote(<<, >>)dnl - <<--enable-long_long turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT], + <<--enable-long-long turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT], changequote([, ])dnl [case "$enableval" in yes) enable_long_long=yes ;; @@ -932,6 +933,7 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl *) AC_MSG_ERROR([Unknown argument to enable/disable long long]) ;; esac], enable_long_long=GLIBCPP_ENABLE_LONG_LONG_DEFAULT)dnl + AC_MSG_RESULT($enable_long_long) dnl Option parsed, now set things appropriately case "$enable_long_long" in yes) AC_DEFINE(_GLIBCPP_USE_LONG_LONG) @@ -944,29 +946,35 @@ dnl dnl Check for certain special build configurations. dnl dnl GLIBCPP_ENABLE_SHADOW -dnl --enable-shadow-headers [does stuff]. -dnl --disable-shadow-headers [does not do stuff]. +dnl --enable-cshadow-headers [does stuff]. +dnl --disable-cshadow-headers [does not do stuff]. dnl + This will eventually need to be on by default. dnl + Usage: GLIBCPP_ENABLE_SHADOW[(DEFAULT)] dnl Where DEFAULT is either `yes' or `no'. If ommitted, it dnl defaults to `no'. AC_DEFUN(GLIBCPP_ENABLE_SHADOW, [dnl define([GLIBCPP_ENABLE_SHADOW_DEFAULT], ifelse($1, yes, yes, no))dnl -AC_ARG_ENABLE(shadow-headers, +AC_MSG_CHECKING([for enabled cshadow headers]) +AC_ARG_ENABLE(cshadow-headers, changequote(<<, >>)dnl -<< --enable-shadow-headers construct "shadowed" C header files for - g++ [default=>>GLIBCPP_ENABLE_SHADOW_DEFAULT], +<< --enable-cshadow-headers construct "shadowed" C header files for + g++ [default=>>GLIBCPP_ENABLE_SHADOW_DEFAULT], changequote([, ])dnl [case "$enableval" in - yes) enable_shadow_headers=yes ;; - no) enable_shadow_headers=no ;; - *) AC_MSG_ERROR([Unknown argument to enable/disable shadowed C headers]) ;; + yes) enable_cshadow_headers=yes + ;; + no) enable_cshadow_headers=no + ;; + *) AC_MSG_ERROR([Unknown argument to enable/disable shadowed C headers]) + ;; esac], -enable_shadow_headers=GLIBCPP_ENABLE_SHADOW_DEFAULT)dnl +enable_cshadow_headers=GLIBCPP_ENABLE_SHADOW_DEFAULT)dnl +AC_MSG_RESULT($enable_cshadow_headers) dnl Option parsed, now set things appropriately -case "$enable_shadow_headers" in +case "$enable_cshadow_headers" in yes) - SHADOW_INCLUDES="-I -am -the -walrus" + SHADOW_INCLUDES="-I$srcdir/shadow -I$blddir/cshadow" +$srcdir/inclosure "-I $blddir/../../gcc/include/ -I /usr/include/ -G machine/ansi.h" | $srcdir/mkcshadow ;; no) SHADOW_INCLUDES='' diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index d1c26d0..9a7dbd7 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -37,10 +37,10 @@ ac_help="$ac_help --enable-cstdio enable GNU libio for target io package. (default) --enable-cstdio=LIB use LIB target-speific io package." ac_help="$ac_help - --enable-long_long turns on 'long long' [default=no]" + --enable-long-long turns on 'long long' [default=no]" ac_help="$ac_help - --enable-shadow-headers construct "shadowed" C header files for - g++ [default=no]" + --enable-cshadow-headers construct "shadowed" C header files for + g++ [default=no]" ac_help="$ac_help --enable-threads enable thread usage for target GCC. --enable-threads=LIB use LIB thread package for target GCC." @@ -2325,7 +2325,9 @@ else GLIBCPP_NEED_LIBIO_FALSE= fi - # Check whether --enable-long-long or --disable-long-long was given. + echo $ac_n "checking for enabled long long""... $ac_c" 1>&6 +echo "configure:2330: checking for enabled long long" >&5 + # Check whether --enable-long-long or --disable-long-long was given. if test "${enable_long_long+set}" = set; then enableval="$enable_long_long" case "$enableval" in @@ -2336,6 +2338,7 @@ if test "${enable_long_long+set}" = set; then else enable_long_long=no fi + echo "$ac_t""$enable_long_long" 1>&6 case "$enable_long_long" in yes) cat >> confdefs.h <<\EOF #define _GLIBCPP_USE_LONG_LONG 1 @@ -2344,20 +2347,27 @@ EOF ;; esac -# Check whether --enable-shadow-headers or --disable-shadow-headers was given. -if test "${enable_shadow_headers+set}" = set; then - enableval="$enable_shadow_headers" +echo $ac_n "checking for enabled cshadow headers""... $ac_c" 1>&6 +echo "configure:2352: checking for enabled cshadow headers" >&5 +# Check whether --enable-cshadow-headers or --disable-cshadow-headers was given. +if test "${enable_cshadow_headers+set}" = set; then + enableval="$enable_cshadow_headers" case "$enableval" in - yes) enable_shadow_headers=yes ;; - no) enable_shadow_headers=no ;; - *) { echo "configure: error: Unknown argument to enable/disable shadowed C headers" 1>&2; exit 1; } ;; + yes) enable_cshadow_headers=yes + ;; + no) enable_cshadow_headers=no + ;; + *) { echo "configure: error: Unknown argument to enable/disable shadowed C headers" 1>&2; exit 1; } + ;; esac else - enable_shadow_headers=no + enable_cshadow_headers=no fi -case "$enable_shadow_headers" in +echo "$ac_t""$enable_cshadow_headers" 1>&6 +case "$enable_cshadow_headers" in yes) - SHADOW_INCLUDES="-I -am -the -walrus" + SHADOW_INCLUDES="-I$srcdir/shadow -I$blddir/cshadow" +$srcdir/inclosure "-I $blddir/../../gcc/include/ -I /usr/include/ -G machine/ansi.h" | $srcdir/mkcshadow ;; no) SHADOW_INCLUDES='' @@ -2368,7 +2378,7 @@ esac echo $ac_n "checking for threads package to use""... $ac_c" 1>&6 -echo "configure:2372: checking for threads package to use" >&5 +echo "configure:2382: checking for threads package to use" >&5 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then enableval="$enable_threads" @@ -2431,17 +2441,17 @@ fi posix) ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for pthread.h""... $ac_c" 1>&6 -echo "configure:2435: checking for pthread.h" >&5 +echo "configure:2445: checking for pthread.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 2440 "configure" +#line 2450 "configure" #include "confdefs.h" #include <pthread.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2455: \"$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* @@ -2630,17 +2640,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2634: checking for $ac_hdr" >&5 +echo "configure:2644: 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 2639 "configure" +#line 2649 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2654: \"$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* @@ -2670,7 +2680,7 @@ done echo $ac_n "checking for GNU C++ __complex__ support""... $ac_c" 1>&6 -echo "configure:2674: checking for GNU C++ __complex__ support" >&5 +echo "configure:2684: 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 @@ -2684,7 +2694,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 2688 "configure" +#line 2698 "configure" #include "confdefs.h" struct dcomplex { __complex__ double x; }; \ dcomplex f(const dcomplex& x) { return dcomplex(x); } @@ -2693,7 +2703,7 @@ int main() { dcomplex x; f(x); ; return 0; } EOF -if { (eval echo configure:2697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_complex=ok else @@ -2725,7 +2735,7 @@ EOF echo $ac_n "checking for GNU C++ __complex__ float support""... $ac_c" 1>&6 -echo "configure:2729: checking for GNU C++ __complex__ float support" >&5 +echo "configure:2739: 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 @@ -2758,14 +2768,14 @@ cross_compiling=$ac_cv_prog_cxx_cross }; EOB cat > conftest.$ac_ext <<EOF -#line 2762 "configure" +#line 2772 "configure" #include "confdefs.h" #include "conftest.h" int main() { ; return 0; } EOF -if { (eval echo configure:2769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_float_complex=ok else @@ -2796,16 +2806,16 @@ EOF echo $ac_n "checking for __builtin_sinf""... $ac_c" 1>&6 -echo "configure:2800: checking for __builtin_sinf" >&5 +echo "configure:2810: checking for __builtin_sinf" >&5 cat > conftest.$ac_ext <<EOF -#line 2802 "configure" +#line 2812 "configure" #include "confdefs.h" #include <math.h> int main() { float foo(void) { __builtin_sinf(0.0); } ; return 0; } EOF -if { (eval echo configure:2809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_sinf=yes else @@ -2824,16 +2834,16 @@ EOF fi echo $ac_n "checking for __builtin_cosf""... $ac_c" 1>&6 -echo "configure:2828: checking for __builtin_cosf" >&5 +echo "configure:2838: checking for __builtin_cosf" >&5 cat > conftest.$ac_ext <<EOF -#line 2830 "configure" +#line 2840 "configure" #include "confdefs.h" #include <math.h> int main() { float foo(void) { __builtin_cosf(0.0); } ; return 0; } EOF -if { (eval echo configure:2837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_cosf=yes else @@ -2852,16 +2862,16 @@ EOF fi echo $ac_n "checking for __builtin_fabsf""... $ac_c" 1>&6 -echo "configure:2856: checking for __builtin_fabsf" >&5 +echo "configure:2866: checking for __builtin_fabsf" >&5 cat > conftest.$ac_ext <<EOF -#line 2858 "configure" +#line 2868 "configure" #include "confdefs.h" #include <math.h> int main() { float foo(void) { __builtin_fabsf(0.0); } ; return 0; } EOF -if { (eval echo configure:2865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_fabsf=yes else @@ -2880,16 +2890,16 @@ EOF fi echo $ac_n "checking for __builtin_sqrtf""... $ac_c" 1>&6 -echo "configure:2884: checking for __builtin_sqrtf" >&5 +echo "configure:2894: checking for __builtin_sqrtf" >&5 cat > conftest.$ac_ext <<EOF -#line 2886 "configure" +#line 2896 "configure" #include "confdefs.h" #include <math.h> int main() { float foo(void) { __builtin_sqrtf(0.0); } ; return 0; } EOF -if { (eval echo configure:2893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_builtin_sqrtf=yes else @@ -2909,7 +2919,7 @@ EOF echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:2913: checking for sin in -lm" >&5 +echo "configure:2923: 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 @@ -2917,7 +2927,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 2921 "configure" +#line 2931 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2928,7 +2938,7 @@ int main() { sin() ; return 0; } EOF -if { (eval echo configure:2932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2942: \"$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 @@ -2955,17 +2965,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2959: checking for $ac_hdr" >&5 +echo "configure:2969: 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 2964 "configure" +#line 2974 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2979: \"$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* @@ -2997,12 +3007,12 @@ done carg cargf nan hypot hypotf atan2f expf copysignf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3001: checking for $ac_func" >&5 +echo "configure:3011: 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 3006 "configure" +#line 3016 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3025,7 +3035,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3039: \"$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 @@ -3054,12 +3064,12 @@ done USE_LONG_DOUBLE=no echo $ac_n "checking for copysignl""... $ac_c" 1>&6 -echo "configure:3058: checking for copysignl" >&5 +echo "configure:3068: 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 3063 "configure" +#line 3073 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char copysignl(); below. */ @@ -3082,7 +3092,7 @@ copysignl(); ; return 0; } EOF -if { (eval echo configure:3086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3096: \"$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 @@ -3101,12 +3111,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:3105: checking for $ac_func" >&5 +echo "configure:3115: 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 3110 "configure" +#line 3120 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3129,7 +3139,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3143: \"$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 @@ -3167,12 +3177,12 @@ fi fpclass qfpclass do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3171: checking for $ac_func" >&5 +echo "configure:3181: 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 3176 "configure" +#line 3186 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3195,7 +3205,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3209: \"$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 @@ -3230,12 +3240,12 @@ _strtof _strtold _fabsf _sincos _sincosf _sincosl _finite _finitef _qfinite \ _fpclass _qfpclass do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3234: checking for $ac_func" >&5 +echo "configure:3244: 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 3239 "configure" +#line 3249 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3258,7 +3268,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3272: \"$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 @@ -3288,17 +3298,17 @@ LIBS="$save_LIBS" ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wchar.h""... $ac_c" 1>&6 -echo "configure:3292: checking for wchar.h" >&5 +echo "configure:3302: 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 3297 "configure" +#line 3307 "configure" #include "confdefs.h" #include <wchar.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3312: \"$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* @@ -3316,16 +3326,16 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for native mbstate_t""... $ac_c" 1>&6 -echo "configure:3320: checking for native mbstate_t" >&5 +echo "configure:3330: checking for native mbstate_t" >&5 cat > conftest.$ac_ext <<EOF -#line 3322 "configure" +#line 3332 "configure" #include "confdefs.h" #include <wchar.h> int main() { mbstate_t teststate; ; return 0; } EOF -if { (eval echo configure:3329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* use_native_mbstatet=yes else @@ -3344,16 +3354,16 @@ EOF fi echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6 -echo "configure:3348: checking for WCHAR_MIN and WCHAR_MAX" >&5 +echo "configure:3358: checking for WCHAR_MIN and WCHAR_MAX" >&5 cat > conftest.$ac_ext <<EOF -#line 3350 "configure" +#line 3360 "configure" #include "confdefs.h" #include <wchar.h> int main() { int i = WCHAR_MIN; int j = WCHAR_MAX; ; return 0; } EOF -if { (eval echo configure:3357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_wchar_minmax=yes else @@ -3374,9 +3384,9 @@ EOF # Test wchar.h for WEOF, which is what we use to determine whether # to specialize for wchar_t or not. echo $ac_n "checking for WEOF""... $ac_c" 1>&6 -echo "configure:3378: checking for WEOF" >&5 +echo "configure:3388: checking for WEOF" >&5 cat > conftest.$ac_ext <<EOF -#line 3380 "configure" +#line 3390 "configure" #include "confdefs.h" #include <wchar.h> @@ -3385,7 +3395,7 @@ int main() { wint_t i = WEOF; ; return 0; } EOF -if { (eval echo configure:3389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_weof=yes else @@ -3400,12 +3410,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:3404: checking for $ac_func" >&5 +echo "configure:3414: 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 3409 "configure" +#line 3419 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3428,7 +3438,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3442: \"$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 @@ -3457,7 +3467,7 @@ done echo $ac_n "checking for wide character support""... $ac_c" 1>&6 -echo "configure:3461: checking for wide character support" >&5 +echo "configure:3471: checking for wide character support" >&5 if test $has_weof = "yes" && test $has_wchar_minmax = "yes"; then libinst_wstring_la="libinst-wstring.la" cat >> confdefs.h <<\EOF @@ -3485,17 +3495,17 @@ fi ac_safe=`echo "ctype.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ctype.h""... $ac_c" 1>&6 -echo "configure:3489: checking for ctype.h" >&5 +echo "configure:3499: 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 3494 "configure" +#line 3504 "configure" #include "confdefs.h" #include <ctype.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3509: \"$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* @@ -3516,9 +3526,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:3520: checking <ctype> for gnu-linux " >&5 +echo "configure:3530: checking <ctype> for gnu-linux " >&5 cat > conftest.$ac_ext <<EOF -#line 3522 "configure" +#line 3532 "configure" #include "confdefs.h" #include <ctype.h> int main() { @@ -3529,7 +3539,7 @@ int + __ctype_tolower[a] + __ctype_toupper[a] + __ctype_b[a];} ; return 0; } EOF -if { (eval echo configure:3533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_linux=yes @@ -3548,9 +3558,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:3552: checking <ctype> for freebsd 4.0 " >&5 +echo "configure:3562: checking <ctype> for freebsd 4.0 " >&5 cat > conftest.$ac_ext <<EOF -#line 3554 "configure" +#line 3564 "configure" #include "confdefs.h" #include <ctype.h> int main() { @@ -3560,7 +3570,7 @@ int + _CTYPE_D + _CTYPE_P + _CTYPE_X + _CTYPE_G ;} ; return 0; } EOF -if { (eval echo configure:3564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_bsd=yes @@ -3580,9 +3590,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:3584: checking <ctype> for freebsd 3.4 " >&5 +echo "configure:3594: checking <ctype> for freebsd 3.4 " >&5 cat > conftest.$ac_ext <<EOF -#line 3586 "configure" +#line 3596 "configure" #include "confdefs.h" #include <ctype.h> int main() { @@ -3592,7 +3602,7 @@ int + _D + _P + _X + _G + __istype (a, 0);} ; return 0; } EOF -if { (eval echo configure:3596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_freebsd34=yes @@ -3612,9 +3622,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:3616: checking <ctype> for solaris 2.6,7,8 " >&5 +echo "configure:3626: checking <ctype> for solaris 2.6,7,8 " >&5 cat > conftest.$ac_ext <<EOF -#line 3618 "configure" +#line 3628 "configure" #include "confdefs.h" #include <ctype.h> int main() { @@ -3625,7 +3635,7 @@ int + __trans_lower[a] + __trans_upper[a] + __ctype_mask[a];} ; return 0; } EOF -if { (eval echo configure:3629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_solaris=yes @@ -3640,7 +3650,7 @@ rm -f conftest* if test $ctype_solaris = "yes"; then echo $ac_n "checking for version""... $ac_c" 1>&6 -echo "configure:3644: checking for version" >&5 +echo "configure:3654: 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' @@ -3649,14 +3659,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 3653 "configure" +#line 3663 "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:3660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_solaris26=yes @@ -3688,9 +3698,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:3692: checking <ctype> for solaris 2.5.1 " >&5 +echo "configure:3702: checking <ctype> for solaris 2.5.1 " >&5 cat > conftest.$ac_ext <<EOF -#line 3694 "configure" +#line 3704 "configure" #include "confdefs.h" #include <ctype.h> int main() { @@ -3700,7 +3710,7 @@ int + __ctype[a];} ; return 0; } EOF -if { (eval echo configure:3704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_solaris25=yes @@ -3720,9 +3730,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking <ctype> for aix ""... $ac_c" 1>&6 -echo "configure:3724: checking <ctype> for aix " >&5 +echo "configure:3734: checking <ctype> for aix " >&5 cat > conftest.$ac_ext <<EOF -#line 3726 "configure" +#line 3736 "configure" #include "confdefs.h" #include <ctype.h> int main() { @@ -3733,7 +3743,7 @@ int + _VALC('a') + _IS('c', 0);} ; return 0; } EOF -if { (eval echo configure:3737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_aix=yes @@ -3753,9 +3763,9 @@ rm -f conftest* if test $ctype_default = "yes"; then echo $ac_n "checking <ctype> for newlib ""... $ac_c" 1>&6 -echo "configure:3757: checking <ctype> for newlib " >&5 +echo "configure:3767: checking <ctype> for newlib " >&5 cat > conftest.$ac_ext <<EOF -#line 3759 "configure" +#line 3769 "configure" #include "confdefs.h" #include <ctype.h> int main() { @@ -3765,7 +3775,7 @@ int + _ctype_[a];} ; return 0; } EOF -if { (eval echo configure:3769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* \ ctype_newlib=yes @@ -3799,17 +3809,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3803: checking for $ac_hdr" >&5 +echo "configure:3813: 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 3808 "configure" +#line 3818 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3823: \"$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* @@ -3838,12 +3848,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3842: checking for $ac_func" >&5 +echo "configure:3852: 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 3847 "configure" +#line 3857 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3866,7 +3876,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3880: \"$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 @@ -3891,7 +3901,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:3895: checking for working mmap" >&5 +echo "configure:3905: 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 @@ -3899,7 +3909,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 3903 "configure" +#line 3913 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -4039,7 +4049,7 @@ main() } EOF -if { (eval echo configure:4043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4053: \"$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 @@ -4102,19 +4112,19 @@ fi if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:4106: checking for LC_MESSAGES" >&5 +echo "configure:4116: 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 4111 "configure" +#line 4121 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:4118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4128: \"$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 @@ -4624,15 +4634,6 @@ blddir=`pwd` # Generate bits/c++io.h and src/c++io.cc - - - - - - - - - chmod +x $blddir/mkcheck $srcdir/mkc++config $blddir $srcdir $srcdir/mknumeric_limits $blddir $srcdir $xcompiling diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in index 682821e..9f2751b 100644 --- a/libstdc++-v3/configure.in +++ b/libstdc++-v3/configure.in @@ -188,12 +188,3 @@ AC_OUTPUT_COMMANDS([cp $srcdir/config/$THREADH $blddir/bits/c++threads.h]) # Generate bits/c++io.h and src/c++io.cc AC_OUTPUT_COMMANDS([cp $srcdir/config/$CSTDIO_H $blddir/bits/c++io.h]) AC_OUTPUT_COMMANDS([cp $srcdir/config/$CSTDIO_CC $blddir/src/c++io.cc]) - - - - - - - - - |