diff options
Diffstat (limited to 'newlib/configure')
-rwxr-xr-x | newlib/configure | 527 |
1 files changed, 142 insertions, 385 deletions
diff --git a/newlib/configure b/newlib/configure index ce9246a31..05c5ae95a 100755 --- a/newlib/configure +++ b/newlib/configure @@ -14,32 +14,20 @@ ac_default_prefix=/usr/local ac_help="$ac_help --enable-newlib-io-pos-args enable printf-family positional arg support" ac_help="$ac_help - --enable-newlib-io-long-long enable long long type support in IO functions like printf/scanf" -ac_help="$ac_help - --enable-newlib-io-long-double enable long double type support in IO functions printf/scanf" -ac_help="$ac_help - --enable-newlib-mb enable multibyte support" -ac_help="$ac_help - --enable-newlib-iconv-encodings enable specific comma-separated list of bidirectional iconv encodings to be built-in" -ac_help="$ac_help - --enable-newlib-iconv-from-encodings enable specific comma-separated list of \"from\" iconv encodings to be built-in" -ac_help="$ac_help - --enable-newlib-iconv-to-encodings enable specific comma-separated list of \"to\" iconv encodings to be built-in" -ac_help="$ac_help - --enable-newlib-iconv-external-ccs enable capabilities to load external CCS files for iconv" -ac_help="$ac_help - --disable-newlib-atexit-alloc disable dynamic allocation of atexit entries" -ac_help="$ac_help --enable-multilib build many library versions (default)" ac_help="$ac_help --enable-target-optspace optimize for space" ac_help="$ac_help --enable-malloc-debugging indicate malloc debugging requested" ac_help="$ac_help - --enable-newlib-multithread enable support for multiple threads" + --enable-newlib-mb enable multibyte support" ac_help="$ac_help --enable-newlib-iconv enable iconv library support" ac_help="$ac_help + --enable-newlib-builtin-converters enable specific comma-separated list of iconv converters to be built-in" +ac_help="$ac_help + --enable-newlib-multithread enable support for multiple threads" +ac_help="$ac_help --enable-newlib-elix-level supply desired elix library level (1-4)" ac_help="$ac_help --disable-newlib-io-float disable printf/scanf family float support" @@ -605,108 +593,9 @@ if test "${enable_newlib_io_pos_args+set}" = set; then *) { echo "configure: error: bad value ${enableval} for newlib-io-pos-args option" 1>&2; exit 1; } ;; esac else - newlib_io_pos_args= -fi - -# Check whether --enable-newlib-io-long-long or --disable-newlib-io-long-long was given. -if test "${enable_newlib_io_long_long+set}" = set; then - enableval="$enable_newlib_io_long_long" - case "${enableval}" in - yes) newlib_io_long_long=yes;; - no) newlib_io_long_long=no ;; - *) { echo "configure: error: bad value ${enableval} for newlib-io-long-long option" 1>&2; exit 1; } ;; - esac -else - newlib_io_long_long= -fi - -# Check whether --enable-newlib-io-long-double or --disable-newlib-io-long-double was given. -if test "${enable_newlib_io_long_double+set}" = set; then - enableval="$enable_newlib_io_long_double" - case "${enableval}" in - yes) newlib_io_long_double=yes;; - no) newlib_io_long_double=no ;; - *) { echo "configure: error: bad value ${enableval} for newlib-io-long-double option" 1>&2; exit 1; } ;; - esac -else - newlib_io_long_double= -fi - -# Check whether --enable-newlib-mb or --disable-newlib-mb was given. -if test "${enable_newlib_mb+set}" = set; then - enableval="$enable_newlib_mb" - case "${enableval}" in - yes) newlib_mb=yes;; - no) newlib_mb=no ;; - *) { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;; - esac -else - newlib_mb= -fi - -# Check whether --enable-newlib-iconv-encodings or --disable-newlib-iconv-encodings was given. -if test "${enable_newlib_iconv_encodings+set}" = set; then - enableval="$enable_newlib_iconv_encodings" - if test x${enableval} = x; then - { echo "configure: error: bad value ${enableval} for newlib-iconv-encodings option - use comma-separated encodings list" 1>&2; exit 1; } - fi - iconv_encodings=${enableval} - -else - iconv_encodings= -fi - -# Check whether --enable-newlib-iconv-from-encodings or --disable-newlib-iconv-from-encodings was given. -if test "${enable_newlib_iconv_from_encodings+set}" = set; then - enableval="$enable_newlib_iconv_from_encodings" - if test x${enableval} = x; then - { echo "configure: error: bad value ${enableval} for newlib-iconv-from-encodings option - use comma-separated encodings list" 1>&2; exit 1; } - fi - iconv_from_encodings=${enableval} - -else - iconv_from_encodings= + newlib_io_pos_args=no fi -# Check whether --enable-newlib-iconv-to-encodings or --disable-newlib-iconv-to-encodings was given. -if test "${enable_newlib_iconv_to_encodings+set}" = set; then - enableval="$enable_newlib_iconv_to_encodings" - if test x${enableval} = x; then - { echo "configure: error: bad value ${enableval} for newlib-iconv-to-encodings option - use comma-separated encodings list" 1>&2; exit 1; } - fi - iconv_to_encodings=${enableval} - -else - iconv_to_encodings= -fi - -# Check whether --enable-newlib-iconv-external-ccs or --disable-newlib-iconv-external-ccs was given. -if test "${enable_newlib_iconv_external_ccs+set}" = set; then - enableval="$enable_newlib_iconv_external_ccs" - if test "${newlib_iconv_external_ccs+set}" != set; then - case "${enableval}" in - yes) newlib_iconv_external_ccs=yes ;; - no) newlib_iconv_external_ccs=no ;; - *) { echo "configure: error: bad value ${enableval} for newlib-iconv-external-ccs option" 1>&2; exit 1; } ;; - esac - fi -else - newlib_iconv_external_ccs=${newlib_iconv_external_ccs} -fi - -# Check whether --enable-newlib-atexit-dynamic-alloc or --disable-newlib-atexit-dynamic-alloc was given. -if test "${enable_newlib_atexit_dynamic_alloc+set}" = set; then - enableval="$enable_newlib_atexit_dynamic_alloc" - if test "${newlib_atexit_dynamic_alloc+set}" != set; then - case "${enableval}" in - yes) newlib_atexit_dynamic_alloc=yes ;; - no) newlib_atexit_dynamic_alloc=no ;; - *) { echo "configure: error: bad value ${enableval} for newlib-atexit-dynamic-alloc option" 1>&2; exit 1; } ;; - esac - fi -else - newlib_atexit_dynamic_alloc=yes -fi am__api_version="1.4" # Find a good install program. We prefer a C program (faster), @@ -721,7 +610,7 @@ am__api_version="1.4" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:725: checking for a BSD compatible install" >&5 +echo "configure:614: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -774,7 +663,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:778: checking whether build environment is sane" >&5 +echo "configure:667: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -831,7 +720,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:835: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:724: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -864,12 +753,12 @@ else fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:868: checking for Cygwin environment" >&5 +echo "configure:757: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 873 "configure" +#line 762 "configure" #include "confdefs.h" int main() { @@ -880,7 +769,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -897,19 +786,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:901: checking for mingw32 environment" >&5 +echo "configure:790: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 906 "configure" +#line 795 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -962,30 +851,52 @@ else malloc_debugging= fi -# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given. -if test "${enable_newlib_multithread+set}" = set; then - enableval="$enable_newlib_multithread" +# Check whether --enable-newlib-mb or --disable-newlib-mb was given. +if test "${enable_newlib_mb+set}" = set; then + enableval="$enable_newlib_mb" case "${enableval}" in - yes) newlib_multithread=yes ;; - no) newlib_multithread=no ;; - *) { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;; + yes) newlib_mb=yes ;; + no) newlib_mb=no ;; + *) { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;; esac else - newlib_multithread=yes + newlib_mb= fi # Check whether --enable-newlib-iconv or --disable-newlib-iconv was given. if test "${enable_newlib_iconv+set}" = set; then enableval="$enable_newlib_iconv" - if test "${newlib_iconv+set}" != set; then - case "${enableval}" in - yes) newlib_iconv=yes ;; - no) newlib_iconv=no ;; - *) { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;; - esac + case "${enableval}" in + yes) newlib_iconv=yes ;; + no) newlib_iconv=no ;; + *) { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;; + esac +else + newlib_iconv= +fi + +# Check whether --enable-newlib-builtin-converters or --disable-newlib-builtin-converters was given. +if test "${enable_newlib_builtin_converters+set}" = set; then + enableval="$enable_newlib_builtin_converters" + if test x${enableval} = x; then + { echo "configure: error: bad value ${enableval} for newlib-builtin-converters option - use comma-separated list" 1>&2; exit 1; } fi + builtin_converters=${enableval} + else - newlib_iconv=${newlib_iconv} + builtin_converters= +fi + +# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given. +if test "${enable_newlib_multithread+set}" = set; then + enableval="$enable_newlib_multithread" + case "${enableval}" in + yes) newlib_multithread=yes ;; + no) newlib_multithread=no ;; + *) { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;; + esac +else + newlib_multithread=yes fi # Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given. @@ -1079,7 +990,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1083: checking host system type" >&5 +echo "configure:994: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1100,7 +1011,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:1104: checking target system type" >&5 +echo "configure:1015: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -1118,7 +1029,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1122: checking build system type" >&5 +echo "configure:1033: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1144,17 +1055,24 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.12.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } fi +cat >> confdefs.h <<EOF +#define PACKAGE "$PACKAGE" +EOF + +cat >> confdefs.h <<EOF +#define VERSION "$VERSION" +EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6 -echo "configure:1158: checking for working aclocal-${am__api_version}" >&5 +echo "configure:1076: checking for working aclocal-${am__api_version}" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1167,7 +1085,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1171: checking for working autoconf" >&5 +echo "configure:1089: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1180,7 +1098,7 @@ else fi echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6 -echo "configure:1184: checking for working automake-${am__api_version}" >&5 +echo "configure:1102: checking for working automake-${am__api_version}" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1193,7 +1111,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1197: checking for working autoheader" >&5 +echo "configure:1115: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1206,7 +1124,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1210: checking for working makeinfo" >&5 +echo "configure:1128: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1231,7 +1149,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1235: checking for $ac_word" >&5 +echo "configure:1153: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1261,7 +1179,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1265: checking for $ac_word" >&5 +echo "configure:1183: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1310,7 +1228,7 @@ fi fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1314: checking whether we are using GNU C" >&5 +echo "configure:1232: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1319,7 +1237,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1334,7 +1252,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1338: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1256: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1365,7 +1283,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1369: checking for $ac_word" >&5 +echo "configure:1287: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1397,7 +1315,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1401: checking for $ac_word" >&5 +echo "configure:1319: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1429,7 +1347,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1433: checking for $ac_word" >&5 +echo "configure:1351: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1461,7 +1379,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1465: checking for $ac_word" >&5 +echo "configure:1383: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1506,7 +1424,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1510: checking for a BSD compatible install" >&5 +echo "configure:1428: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1559,11 +1477,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1567: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1482: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1597,7 +1512,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1601: checking for executable suffix" >&5 +echo "configure:1516: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1607,7 +1522,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1782,7 +1697,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1786: checking for $ac_word" >&5 +echo "configure:1701: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1812,7 +1727,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1816: checking for $ac_word" >&5 +echo "configure:1731: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1863,7 +1778,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1867: checking for $ac_word" >&5 +echo "configure:1782: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1895,7 +1810,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1899: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1906,12 +1821,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1910 "configure" +#line 1825 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1937,12 +1852,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1941: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1856: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1946: checking whether we are using GNU C" >&5 +echo "configure:1861: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1951,7 +1866,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1970,7 +1885,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1974: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1889: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2013,7 +1928,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:2017: checking for ld used by GCC" >&5 +echo "configure:1932: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -2043,10 +1958,10 @@ echo "configure:2017: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:2047: checking for GNU ld" >&5 +echo "configure:1962: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:2050: checking for non-GNU ld" >&5 +echo "configure:1965: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2081,7 +1996,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:2085: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:2000: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2098,7 +2013,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:2102: checking for $LD option to reload object files" >&5 +echo "configure:2017: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2110,7 +2025,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:2114: checking for BSD-compatible nm" >&5 +echo "configure:2029: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2148,7 +2063,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2152: checking whether ln -s works" >&5 +echo "configure:2067: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2169,7 +2084,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2173: checking how to recognise dependant libraries" >&5 +echo "configure:2088: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2342,13 +2257,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2346: checking for object suffix" >&5 +echo "configure:2261: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2372,7 +2287,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2376: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2291: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2434,7 +2349,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2438: checking for file" >&5 +echo "configure:2353: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2505,7 +2420,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2509: checking for $ac_word" >&5 +echo "configure:2424: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2537,7 +2452,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2541: checking for $ac_word" >&5 +echo "configure:2456: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2572,7 +2487,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2576: checking for $ac_word" >&5 +echo "configure:2491: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2604,7 +2519,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2608: checking for $ac_word" >&5 +echo "configure:2523: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2671,8 +2586,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2675 "configure"' > conftest.$ac_ext - if { (eval echo configure:2676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2590 "configure"' > conftest.$ac_ext + if { (eval echo configure:2591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2691,7 +2606,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2709,7 +2624,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2713: checking whether the C compiler needs -belf" >&5 +echo "configure:2628: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2722,14 +2637,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2726 "configure" +#line 2641 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2759,7 +2674,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2763: checking for $ac_word" >&5 +echo "configure:2678: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2791,7 +2706,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2795: checking for $ac_word" >&5 +echo "configure:2710: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2826,7 +2741,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2830: checking for $ac_word" >&5 +echo "configure:2745: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2858,7 +2773,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2862: checking for $ac_word" >&5 +echo "configure:2777: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2893,7 +2808,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2897: checking for $ac_word" >&5 +echo "configure:2812: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2925,7 +2840,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2929: checking for $ac_word" >&5 +echo "configure:2844: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2961,12 +2876,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2965: checking if libtool should supply DllMain function" >&5 +echo "configure:2880: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2970 "configure" +#line 2885 "configure" #include "confdefs.h" int main() { @@ -2974,7 +2889,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2995,19 +2910,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2999: checking how to link DLLs" >&5 +echo "configure:2914: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3004 "configure" +#line 2919 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:3011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else @@ -3116,12 +3031,12 @@ exec 5>>./config.log -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3125: checking for $ac_word" >&5 +echo "configure:3040: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3217,7 +3132,7 @@ subdirs="${configdirs}" CRT0= CRT0_DIR= -if test "x${have_crt0}" = "xyes"; then +if test -n "${sys_dir}"; then CRT0=crt0.o CRT0_DIR=libc/ fi @@ -3290,33 +3205,8 @@ EOF fi -if test "${newlib_io_long_long}" = "yes"; then -cat >> confdefs.h <<EOF -#define _WANT_IO_LONG_LONG 1 -EOF - -fi - -if test "${newlib_io_long_double}" = "yes"; then -cat >> confdefs.h <<EOF -#define _WANT_IO_LONG_DOUBLE 1 -EOF - -fi - -if test "${newlib_io_pos_args}" = "yes"; then -cat >> confdefs.h <<EOF -#define _WANT_IO_POS_ARGS 1 -EOF - -fi - if test "${newlib_mb}" = "yes"; then cat >> confdefs.h <<EOF -#define _MB_CAPABLE 1 -EOF - -cat >> confdefs.h <<EOF #define _MB_LEN_MAX 8 EOF @@ -3327,20 +3217,6 @@ EOF fi -if test "${newlib_iconv_external_ccs}" = "yes"; then -cat >> confdefs.h <<EOF -#define _ICONV_ENABLE_EXTERNAL_CCS 1 -EOF - -fi - -if test "${newlib_atexit_dynamic_alloc}" = "yes"; then -cat >> confdefs.h <<EOF -#define _ATEXIT_DYNAMIC_ALLOC 1 -EOF - -fi - cat >> confdefs.h <<EOF #define _NEWLIB_VERSION "$VERSION" EOF @@ -3359,84 +3235,29 @@ EOF fi -if test "x${newlib_iconv_external_ccs}" = "xyes"; then - if test "x${newlib_iconv}" = "x"; then - { echo "configure: error: --enable-newlib-iconv-external-ccs option can't be used if iconv library is disabled" 1>&2; exit 1; } - fi - cat >> confdefs.h <<EOF -#define _ICONV_ENABLE_EXTERNAL_CCS 1 -EOF - -fi - -if test "x${iconv_encodings}" != "x" \ - || test "x${iconv_to_encodings}" != "x" \ - || test "x${iconv_from_encodings}" != "x"; then +if test "x${builtin_converters}" != "x"; then - if test "x${newlib_iconv}" = "x"; then - { echo "configure: error: --enable-newlib-iconv-encodings" 1>&2; exit 1; } + if test x${newlib_iconv} = x; then + { echo "configure: error: --enable-newlib-builtin-converters option can't be used if iconv library is disabled - use --enable-newlib-iconv to enable it" 1>&2; exit 1; } fi - iconv_encodings=`echo "${iconv_encodings}" | sed -e 's/,/ /g' -e 's/-/_/g' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - iconv_to_encodings=`echo "${iconv_to_encodings}" | sed -e 's/,/ /g' -e 's/-/_/g' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - iconv_from_encodings=`echo "${iconv_from_encodings}" | sed -e 's/,/ /g' -e 's/-/_/g' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - - available_encodings=`cat "${srcdir}/libc/iconv/encoding.aliases" | sed -e '/^#.*/d'` + builtin_converters=`echo "${builtin_converters}" | sed -e 's/,/ /g' -e 's/-/_/g' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - - iconv_encodings1="${iconv_encodings}" - iconv_encodings="" - for encoding in ${iconv_encodings1}; do - result=`echo "${available_encodings}" | grep -e "\(^\| \)${encoding}\( \|\$\)"` - if test $? != "0"; then - { echo "configure: error: ${encoding} is not supported - see ${srcdir}/libc/iconv/encoding.aliases file for the list of available encodings" 1>&2; exit 1; } - fi - encoding1=`echo "${result}" | sed -e 's/\(^[^ ]*\).*$/\1/'` - iconv_encodings="${iconv_encodings} ${encoding1}" - done - for encoding in ${iconv_encodings}; do - opt=_ICONV_TO_ENCODING_`echo "${encoding}" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $opt 1 -EOF - - opt=_ICONV_FROM_ENCODING_`echo "${encoding}" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $opt 1 -EOF - - done - - iconv_encodings1="${iconv_to_encodings}" - iconv_to_encodings="" - for encoding in ${iconv_encodings1}; do - result=`echo "${available_encodings}" | grep -e "\(^\| \)${encoding}\( \|\$\)"` + available_converters=`cat "${srcdir}/libc/iconv/charset.aliases" | sed -e '/#/d' | sed -e 'N; s/\n //;'` + + builtin_converters1="${builtin_converters}" + builtin_converters="" + for converter in ${builtin_converters1}; do + result=`echo "${available_converters}" | grep -e "\(^\| \)${converter}\( \|\$\)"` if test $? != "0"; then - { echo "configure: error: ${encoding} is not supported - see ${srcdir}/libc/iconv/encoding.aliases file for the list of available encodings" 1>&2; exit 1; } + { echo "configure: error: ${converter} is not supported - see ${srcdir}/libc/iconv/charset.aliases file for the list of available converters" 1>&2; exit 1; } fi - encoding1=`echo "${result}" | sed -e 's/\(^[^ ]*\).*$/\1/'` - iconv_to_encodings="${iconv_to_encodings} ${encoding1}" - done - for encoding in ${iconv_to_encodings}; do - opt=_ICONV_TO_ENCODING_`echo "${encoding}" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $opt 1 -EOF - + converter1=`echo "${result}" | sed -e 's/\(^[^ ]*\).*$/\1/'` + builtin_converters="${builtin_converters} ${converter1}" done - iconv_encodings1="${iconv_from_encodings}" - iconv_from_encodings="" - for encoding in ${iconv_encodings1}; do - result=`echo "${available_encodings}" | grep -e "\(^\| \)${encoding}\( \|\$\)"` - if test $? != "0"; then - { echo "configure: error: ${encoding} is not supported - see ${srcdir}/libc/iconv/encoding.aliases file for the list of available encodings" 1>&2; exit 1; } - fi - encoding1=`echo "${result}" | sed -e 's/\(^[^ ]*\).*$/\1/'` - iconv_from_encodings="${iconv_from_encodings} ${encoding1}" - done - for encoding in ${iconv_from_encodings}; do - opt=_ICONV_FROM_ENCODING_`echo "${encoding}" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + for converter in ${builtin_converters}; do + opt=_ICONV_CONVERTER_`echo "${converter}" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <<EOF #define $opt 1 EOF @@ -3444,68 +3265,6 @@ EOF done fi; -echo $ac_n "checking for .preinit_array/.init_array/.fini_array support""... $ac_c" 1>&6 -echo "configure:3449: checking for .preinit_array/.init_array/.fini_array support" >&5 -if eval "test \"`echo '$''{'libc_cv_initfinit_array'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.c <<EOF -int _start (void) { return 0; } -int __start (void) { return 0; } -int foo (void) { return 1; } -int (*fp) (void) __attribute__ ((section (".init_array"))) = foo; -EOF -if { ac_try='${CC} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest conftest.c - -static -nostartfiles -nostdlib 1>&AS_MESSAGE_LOG_FD'; { (eval echo configure:3460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } -then - if readelf -S conftest | grep -e INIT_ARRAY > /dev/null; then - libc_cv_initfinit_array=yes - else - libc_cv_initfinit_array=no - fi -else - libc_cv_initfinit_array=no -fi -rm -f conftest* -fi - -echo "$ac_t""$libc_cv_initfinit_array" 1>&6 - -if test $libc_cv_initfinit_array = yes; then - cat >> confdefs.h <<EOF -#define HAVE_INITFINI_ARRAY 1 -EOF - -fi - -echo $ac_n "checking for array aliasing support""... $ac_c" 1>&6 -echo "configure:3483: checking for array aliasing support" >&5 -if eval "test \"`echo '$''{'libc_cv_array_aliasing'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.c <<EOF -char x3 = { 'a', 'b', 'c' }; -extern char y2 __attribute__((alias ("x+1"))); -EOF -if { ac_try='${CC} $CFLAGS $CPPFLAGS -c conftest.c - 1>&AS_MESSAGE_LOG_FD'; { (eval echo configure:3492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } -then - libc_cv_array_aliasing=yes -else - libc_cv_array_aliasing=no -fi -rm -f conftest* -fi - -echo "$ac_t""$libc_cv_array_aliasing" 1>&6 - -if test $libc_cv_array_aliasing = yes; then - cat >> confdefs.h <<EOF -#define _HAVE_ARRAY_ALIASING 1 -EOF - -fi - trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -3722,8 +3481,6 @@ s%@SYSCALL_OBJECTLIST@%$SYSCALL_OBJECTLIST%g s%@UNIX_OBJECTLIST@%$UNIX_OBJECTLIST%g s%@STDIO64_OBJECTLIST@%$STDIO64_OBJECTLIST%g s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g -s%@libc_cv_initfinit_array@%$libc_cv_initfinit_array%g -s%@libc_cv_array_aliasing@%$libc_cv_array_aliasing%g CEOF EOF |