diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2194 |
1 files changed, 539 insertions, 1655 deletions
@@ -16,8 +16,6 @@ ac_help="$ac_help ac_help="$ac_help --enable-libssp Builds libssp directory" ac_help="$ac_help - --enable-libgcc-math Builds libgcc-math directory" -ac_help="$ac_help --with-mpfr-dir=PATH Specify source directory for MPFR library" ac_help="$ac_help --with-mpfr=PATH Specify directory for installed MPFR library" @@ -29,16 +27,13 @@ ac_help="$ac_help --with-build-sysroot=sysroot use sysroot as the system root during the build" ac_help="$ac_help - --enable-bootstrap Enable bootstrapping [yes if native build]" + --enable-bootstrap[=lean] Enable bootstrapping [no]" ac_help="$ac_help --enable-serial-[{host,target,build}-]configure Force sequential configuration of sub-packages for the host, target or build machine, or all sub-packages" ac_help="$ac_help - --with-build-time-tools=path - use given path to find target tools during the build" -ac_help="$ac_help --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer" ac_help="$ac_help @@ -601,7 +596,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:605: checking host system type" >&5 +echo "configure:600: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -622,7 +617,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:626: checking target system type" >&5 +echo "configure:621: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -640,7 +635,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:644: checking build system type" >&5 +echo "configure:639: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -695,7 +690,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," # 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:699: checking for a BSD compatible install" >&5 +echo "configure:694: 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 @@ -748,7 +743,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln works""... $ac_c" 1>&6 -echo "configure:752: checking whether ln works" >&5 +echo "configure:747: checking whether ln works" >&5 if eval "test \"`echo '$''{'acx_cv_prog_LN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -772,7 +767,7 @@ else fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:776: checking whether ln -s works" >&5 +echo "configure:771: 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 @@ -911,12 +906,10 @@ target_libraries="target-libiberty \ target-libstdc++-v3 \ target-libmudflap \ target-libssp \ - target-libgcc-math \ target-libgfortran \ ${libgcj} \ target-libobjc \ - target-libada \ - target-libgomp" + target-libada" # these tools are built using the target libraries, and are intended to # run only in the target environment @@ -1098,6 +1091,7 @@ else fi if test "${ENABLE_LIBADA}" != "yes" ; then + noconfigdirs="$noconfigdirs target-libada" noconfigdirs="$noconfigdirs gnattools" fi @@ -1109,24 +1103,10 @@ else ENABLE_LIBSSP=yes fi - -# Set the default so we build libgcc-math for ix86 and x86_64 -# Check whether --enable-libgcc-math or --disable-libgcc-math was given. -if test "${enable_libgcc_math+set}" = set; then - enableval="$enable_libgcc_math" - : -else - -case "${target}" in - i?86-* | x86_64-* ) - enable_libgcc_math=yes ;; - *) - enable_libgcc_math=no ;; -esac - +if test "${ENABLE_LIBSSP}" != "yes" ; then + noconfigdirs="$noconfigdirs target-libssp" fi - # Save it here so that, even in case of --enable-libgcj, if the Java # front-end isn't enabled, we still get libgcj disabled. libgcj_saved=$libgcj @@ -1144,10 +1124,16 @@ no) esac -# Disable libmudflap on some systems. -if test x$enable_libmudflap = x ; then +# Allow --disable-libmudflap to exclude target-libmudflap +case $enable_libmudflap in +yes) + ;; +no) + noconfigdirs="$noconfigdirs target-libmudflap" + ;; +"") case "${target}" in - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) + *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu) # Enable libmudflap by default in GNU and friends. ;; *-*-freebsd*) @@ -1158,25 +1144,7 @@ if test x$enable_libmudflap = x ; then noconfigdirs="$noconfigdirs target-libmudflap" ;; esac -fi - -# Disable libgomp on non POSIX hosted systems. -if test x$enable_libgomp = x ; then - # Enable libgomp by default on hosted POSIX systems. - case "${target}" in - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) - ;; - *-*-netbsd* | *-*-freebsd* | *-*-openbsd*) - ;; - *-*-solaris2* | *-*-sysv4* | *-*-irix* | *-*-osf* | *-*-hpux*) - ;; - *-*-darwin* | *-*-aix*) - ;; - *) - noconfigdirs="$noconfigdirs target-libgomp" - ;; - esac -fi +esac case "${target}" in @@ -1480,9 +1448,6 @@ case "${target}" in i[3456789]86-*-beos*) noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}" ;; - i[3456789]86-*-rdos*) - noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss" - ;; m32r-*-*) noconfigdirs="$noconfigdirs ${libgcj}" ;; @@ -1794,12 +1759,6 @@ case "${host}" in powerpc-*-darwin*) host_makefile_frag="config/mh-ppc-darwin" ;; - powerpc-*-aix*) - host_makefile_frag="config/mh-ppc-aix" - ;; - rs6000-*-aix*) - host_makefile_frag="config/mh-ppc-aix" - ;; *-*-lynxos*) # /bin/cc is less than useful for our purposes. Always use GCC tentative_cc="/bin/gcc" @@ -1843,6 +1802,8 @@ if test "${build}" != "${host}" ; then CXX=${CXX-${host_alias}-c++} CXXFLAGS=${CXXFLAGS-"-g -O2"} CC_FOR_BUILD=${CC_FOR_BUILD-gcc} + BUILD_PREFIX=${build_alias}- + BUILD_PREFIX_1=${build_alias}- else # Set reasonable default values for some tools even if not Canadian. @@ -1854,10 +1815,13 @@ else # This is all going to change when we autoconfiscate... CC_FOR_BUILD="\$(CC)" + BUILD_PREFIX= + BUILD_PREFIX_1=loser- + # 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:1861: checking for $ac_word" >&5 +echo "configure:1825: 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 @@ -1887,7 +1851,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:1891: checking for $ac_word" >&5 +echo "configure:1855: 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 @@ -1938,7 +1902,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:1942: checking for $ac_word" >&5 +echo "configure:1906: 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 @@ -1970,7 +1934,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1974: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1938: 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. @@ -1981,12 +1945,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1985 "configure" +#line 1949 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1954: \"$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 @@ -2012,12 +1976,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:2016: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1980: 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:2021: checking whether we are using GNU C" >&5 +echo "configure:1985: 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 @@ -2026,7 +1990,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2030: \"$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:1994: \"$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 @@ -2045,7 +2009,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:2049: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2013: 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 @@ -2112,7 +2076,7 @@ fi # Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args. set dummy ${ac_tool_prefix}gnatbind; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2116: checking for $ac_word" >&5 +echo "configure:2080: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2144,7 +2108,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "gnatbind", so it can be a program name with args. set dummy gnatbind; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2148: checking for $ac_word" >&5 +echo "configure:2112: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2177,7 +2141,7 @@ fi fi echo $ac_n "checking whether compiler driver understands Ada""... $ac_c" 1>&6 -echo "configure:2181: checking whether compiler driver understands Ada" >&5 +echo "configure:2145: checking whether compiler driver understands Ada" >&5 if eval "test \"`echo '$''{'acx_cv_cc_gcc_supports_ada'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2209,7 +2173,7 @@ else fi echo $ac_n "checking how to compare bootstrapped objects""... $ac_c" 1>&6 -echo "configure:2213: checking how to compare bootstrapped objects" >&5 +echo "configure:2177: checking how to compare bootstrapped objects" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_cmp_skip'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2307,9 +2271,9 @@ saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $gmpinc" # Check GMP actually works echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6 -echo "configure:2311: checking for correct version of gmp.h" >&5 +echo "configure:2275: checking for correct version of gmp.h" >&5 cat > conftest.$ac_ext <<EOF -#line 2313 "configure" +#line 2277 "configure" #include "confdefs.h" #include "gmp.h" int main() { @@ -2320,7 +2284,7 @@ choke me ; return 0; } EOF -if { (eval echo configure:2324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -2333,12 +2297,12 @@ rm -f conftest* if test x"$have_gmp" = xyes; then echo $ac_n "checking for MPFR""... $ac_c" 1>&6 -echo "configure:2337: checking for MPFR" >&5 +echo "configure:2301: checking for MPFR" >&5 saved_LIBS="$LIBS" LIBS="$LIBS $gmplibs" cat > conftest.$ac_ext <<EOF -#line 2342 "configure" +#line 2306 "configure" #include "confdefs.h" #include <gmp.h> #include <mpfr.h> @@ -2346,7 +2310,7 @@ int main() { mpfr_t n; mpfr_init(n); ; return 0; } EOF -if { (eval echo configure:2350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -2530,14 +2494,6 @@ Recognised languages are: ${potential_languages}" 1>&2; exit 1; } ac_configure_args=`echo " $ac_configure_args" | sed -e 's/ --enable-languages=[^ ]*//' -e 's/$/ --enable-languages='"$enable_languages"/ ` fi -# Handle --disable-<component> generically. -for dir in $configdirs $build_configdirs $target_configdirs ; do - dirname=`echo $dir | sed -e s/target-//g -e s/build-//g -e s/-/_/g` - if eval test x\${enable_${dirname}} "=" xno ; then - noconfigdirs="$noconfigdirs $dir" - fi -done - # Remove the entries in $skipdirs and $noconfigdirs from $configdirs, # $build_configdirs and $target_configdirs. # If we have the source for $noconfigdirs entries, add them to $notsupp. @@ -2714,39 +2670,6 @@ if test x"${with_libs}" != x && test x"${with_libs}" != xno ; then fi fi -# Set with_gnu_as and with_gnu_ld as appropriate. -# -# This is done by determining whether or not the appropriate directory -# is available, and by checking whether or not specific configurations -# have requested that this magic not happen. -# -# The command line options always override the explicit settings in -# configure.in, and the settings in configure.in override this magic. -# -# If the default for a toolchain is to use GNU as and ld, and you don't -# want to do that, then you should use the --without-gnu-as and -# --without-gnu-ld options for the configure script. - -if test x${use_gnu_as} = x && - echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then - with_gnu_as=yes - extra_host_args="$extra_host_args --with-gnu-as" -fi - -if test x${use_gnu_ld} = x && - echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 ; then - with_gnu_ld=yes - extra_host_args="$extra_host_args --with-gnu-ld" -fi - -# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure -# can detect this case. - -if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then - with_newlib=yes - extra_host_args="$extra_host_args --with-newlib" -fi - # Handle ${copy_dirs} set fnord ${copy_dirs} shift @@ -2778,55 +2701,6 @@ while test $# != 0 ; do shift; shift done -# Determine a target-dependent exec_prefix that the installed -# gcc will search in. Keep this list sorted by triplet, with -# the *-*-osname triplets last. -md_exec_prefix= -case "${target}" in - alpha*-*-*vms*) - md_exec_prefix=/gnu/lib/gcc-lib - ;; - i3456786-pc-msdosdjgpp*) - md_exec_prefix=/dev/env/DJDIR/bin - ;; - i3456786-*-sco3.2v5*) - if test $with_gnu_as = yes; then - md_exec_prefix=/usr/gnu/bin - else - md_exec_prefix=/usr/ccs/bin/elf - fi - ;; - - mn10300-*-* | \ - powerpc-*-chorusos* | \ - powerpc*-*-eabi* | \ - powerpc*-*-sysv* | \ - powerpc*-*-kaos* | \ - s390x-ibm-tpf*) - md_exec_prefix=/usr/ccs/bin - ;; - sparc64-*-elf*) - ;; - v850*-*-*) - md_exec_prefix=/usr/ccs/bin - ;; - xtensa-*-elf*) - ;; - - *-*-beos* | \ - *-*-elf* | \ - *-*-hpux* | \ - *-*-netware* | \ - *-*-nto-qnx* | \ - *-*-rtems* | \ - *-*-solaris2* | \ - *-*-sysv45* | \ - *-*-vxworks* | \ - *-wrs-windiss) - md_exec_prefix=/usr/ccs/bin - ;; -esac - extra_arflags_for_target= extra_nmflags_for_target= extra_ranlibflags_for_target= @@ -2884,6 +2758,39 @@ case "${enable_target_optspace}:${target}" in ;; esac +# Set with_gnu_as and with_gnu_ld as appropriate. +# +# This is done by determining whether or not the appropriate directory +# is available, and by checking whether or not specific configurations +# have requested that this magic not happen. +# +# The command line options always override the explicit settings in +# configure.in, and the settings in configure.in override this magic. +# +# If the default for a toolchain is to use GNU as and ld, and you don't +# want to do that, then you should use the --without-gnu-as and +# --without-gnu-ld options for the configure script. + +if test x${use_gnu_as} = x && + echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then + with_gnu_as=yes + extra_host_args="$extra_host_args --with-gnu-as" +fi + +if test x${use_gnu_ld} = x && + echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 ; then + with_gnu_ld=yes + extra_host_args="$extra_host_args --with-gnu-ld" +fi + +# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure +# can detect this case. + +if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then + with_newlib=yes + extra_host_args="$extra_host_args --with-newlib" +fi + # Default to using --with-stabs for certain targets. if test x${with_stabs} = x ; then case "${target}" in @@ -3054,17 +2961,17 @@ case "$have_compiler:$host:$target:$enable_bootstrap" in enable_bootstrap=no ;; # We have a compiler and we are in a native configuration, bootstrap is ok - yes:$build:$build:yes) + yes:$build:$build:yes | yes:$build:$build:lean) ;; # Other configurations, but we have a compiler. Assume the user knows # what he's doing. - yes:*:*:yes) + yes:*:*:yes | yes:*:*:lean) echo "configure: warning: trying to bootstrap a cross compiler" 1>&2 ;; # No compiler: if they passed --enable-bootstrap explicitly, fail - no:*:*:yes) + no:*:*:yes | no:*:*:lean) { echo "configure: error: cannot bootstrap without a compiler" 1>&2; exit 1; } ;; # Fail if wrong command line @@ -3076,11 +2983,16 @@ esac # Adjust the toplevel makefile according to whether bootstrap was selected. case "$enable_bootstrap" in yes) + bootstrap_lean='#' + bootstrap_suffix=bootstrap ;; + lean) + bootstrap_lean='' bootstrap_suffix=bootstrap ;; no) bootstrap_suffix=no-bootstrap ;; esac + for module in ${build_configdirs} ; do if test -z "${no_recursion}" \ && test -f ${build_subdir}/${module}/Makefile; then @@ -3094,13 +3006,10 @@ for module in ${build_configdirs} ; do /^@endif build-$module-$bootstrap_suffix\$/d" done for module in ${configdirs} ; do - if test -z "${no_recursion}"; then - for file in stage*-${module}/Makefile ${module}/Makefile; do - if test -f ${file}; then - echo 1>&2 "*** removing ${file} to force reconfigure" - rm -f ${file} - fi - done + if test -z "${no_recursion}" \ + && test -f ${module}/Makefile; then + echo 1>&2 "*** removing ${module}/Makefile to force reconfigure" + rm -f ${module}/Makefile fi extrasub="$extrasub /^@if $module\$/d @@ -3371,6 +3280,8 @@ done + + # Build module lists & subconfigure args. @@ -3397,7 +3308,7 @@ 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:3401: checking for $ac_word" >&5 +echo "configure:3312: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3437,7 +3348,7 @@ 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:3441: checking for $ac_word" >&5 +echo "configure:3352: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3476,7 +3387,7 @@ 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:3480: checking for $ac_word" >&5 +echo "configure:3391: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_M4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3515,7 +3426,7 @@ 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:3519: checking for $ac_word" >&5 +echo "configure:3430: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3555,7 +3466,7 @@ 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:3559: checking for $ac_word" >&5 +echo "configure:3470: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3594,7 +3505,7 @@ 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:3598: checking for $ac_word" >&5 +echo "configure:3509: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3647,7 +3558,7 @@ 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:3651: checking for $ac_word" >&5 +echo "configure:3562: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_EXPECT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3688,7 +3599,7 @@ 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:3692: checking for $ac_word" >&5 +echo "configure:3603: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RUNTEST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3736,7 +3647,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias- # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3740: checking for $ac_word" >&5 +echo "configure:3651: 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 @@ -3767,7 +3678,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3771: checking for $ac_word" >&5 +echo "configure:3682: 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 @@ -3811,7 +3722,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3815: checking for $ac_word" >&5 +echo "configure:3726: 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 @@ -3842,7 +3753,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3846: checking for $ac_word" >&5 +echo "configure:3757: 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 @@ -3886,7 +3797,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3890: checking for $ac_word" >&5 +echo "configure:3801: 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 @@ -3917,7 +3828,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3921: checking for $ac_word" >&5 +echo "configure:3832: 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 @@ -3961,7 +3872,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3965: checking for $ac_word" >&5 +echo "configure:3876: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3992,7 +3903,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3996: checking for $ac_word" >&5 +echo "configure:3907: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4036,7 +3947,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4040: checking for $ac_word" >&5 +echo "configure:3951: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4067,7 +3978,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4071: checking for $ac_word" >&5 +echo "configure:3982: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4111,7 +4022,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4115: checking for $ac_word" >&5 +echo "configure:4026: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4142,7 +4053,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4146: checking for $ac_word" >&5 +echo "configure:4057: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4186,7 +4097,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4190: checking for $ac_word" >&5 +echo "configure:4101: 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 @@ -4217,7 +4128,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4221: checking for $ac_word" >&5 +echo "configure:4132: 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 @@ -4256,7 +4167,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4260: checking for $ac_word" >&5 +echo "configure:4171: 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 @@ -4287,7 +4198,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4291: checking for $ac_word" >&5 +echo "configure:4202: 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 @@ -4326,7 +4237,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4330: checking for $ac_word" >&5 +echo "configure:4241: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4357,7 +4268,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4361: checking for $ac_word" >&5 +echo "configure:4272: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4401,7 +4312,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4405: checking for $ac_word" >&5 +echo "configure:4316: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4432,7 +4343,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4436: checking for $ac_word" >&5 +echo "configure:4347: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4476,7 +4387,7 @@ fi # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4480: checking for $ac_word" >&5 +echo "configure:4391: 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 @@ -4507,7 +4418,7 @@ fi # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4511: checking for $ac_word" >&5 +echo "configure:4422: 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 @@ -4553,1070 +4464,607 @@ fi # Target tools. -# Check whether --with-build-time-tools or --without-build-time-tools was given. -if test "${with_build_time_tools+set}" = set; then - withval="$with_build_time_tools" - case x"$withval" in - x/*) ;; - *) - with_build_time_tools= - echo "configure: warning: argument to --with-build-time-tools must be an absolute path" 1>&2 - ;; - esac -else - with_build_time_tools= -fi - - - if test -n "$with_build_time_tools"; then - for ncn_progname in cc gcc; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:4575: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_CC_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_CC_FOR_TARGET"; then - for ncn_progname in cc gcc; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in ar; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4592: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4473: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$CC_FOR_TARGET"; then - ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test. + if test -n "$AR_FOR_TARGET"; then + ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_AR_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET" -if test -n "$CC_FOR_TARGET"; then - echo "$ac_t""$CC_FOR_TARGET" 1>&6 +AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET" +if test -n "$AR_FOR_TARGET"; then + echo "$ac_t""$AR_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_CC_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_AR_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4623: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4504: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$CC_FOR_TARGET"; then - ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test. + if test -n "$AR_FOR_TARGET"; then + ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC_FOR_TARGET="${ncn_progname}" + ac_cv_prog_AR_FOR_TARGET="${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET" -if test -n "$CC_FOR_TARGET"; then - echo "$ac_t""$CC_FOR_TARGET" 1>&6 +AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET" +if test -n "$AR_FOR_TARGET"; then + echo "$ac_t""$AR_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_CC_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_CC_FOR_TARGET" ; then - set dummy cc gcc + fi + test -n "$ac_cv_prog_AR_FOR_TARGET" && break +done + +if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then + set dummy ar if test $build = $target ; then - CC_FOR_TARGET="$2" + AR_FOR_TARGET="$2" else - CC_FOR_TARGET="${ncn_target_tool_prefix}$2" + AR_FOR_TARGET="${ncn_target_tool_prefix}$2" fi fi - if test -n "$with_build_time_tools"; then - for ncn_progname in c++ g++ cxx gxx; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:4666: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_CXX_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_CXX_FOR_TARGET"; then - for ncn_progname in c++ g++ cxx gxx; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in as; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4683: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4548: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$CXX_FOR_TARGET"; then - ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test. + if test -n "$AS_FOR_TARGET"; then + ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_CXX_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_AS_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET" -if test -n "$CXX_FOR_TARGET"; then - echo "$ac_t""$CXX_FOR_TARGET" 1>&6 +AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET" +if test -n "$AS_FOR_TARGET"; then + echo "$ac_t""$AS_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_CXX_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_AS_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4714: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4579: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$CXX_FOR_TARGET"; then - ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test. + if test -n "$AS_FOR_TARGET"; then + ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_CXX_FOR_TARGET="${ncn_progname}" + ac_cv_prog_AS_FOR_TARGET="${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET" -if test -n "$CXX_FOR_TARGET"; then - echo "$ac_t""$CXX_FOR_TARGET" 1>&6 +AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET" +if test -n "$AS_FOR_TARGET"; then + echo "$ac_t""$AS_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_CXX_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_CXX_FOR_TARGET" ; then - set dummy c++ g++ cxx gxx + fi + test -n "$ac_cv_prog_AS_FOR_TARGET" && break +done + +if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then + set dummy as if test $build = $target ; then - CXX_FOR_TARGET="$2" + AS_FOR_TARGET="$2" else - CXX_FOR_TARGET="${ncn_target_tool_prefix}$2" + AS_FOR_TARGET="${ncn_target_tool_prefix}$2" fi fi - if test -n "$with_build_time_tools"; then - for ncn_progname in gcc; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:4757: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_GCC_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_GCC_FOR_TARGET"; then - for ncn_progname in gcc; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in cc gcc; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4774: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4623: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$GCC_FOR_TARGET"; then - ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test. + if test -n "$CC_FOR_TARGET"; then + ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_GCC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_CC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET" -if test -n "$GCC_FOR_TARGET"; then - echo "$ac_t""$GCC_FOR_TARGET" 1>&6 +CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET" +if test -n "$CC_FOR_TARGET"; then + echo "$ac_t""$CC_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_GCC_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_CC_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4805: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4654: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$GCC_FOR_TARGET"; then - ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test. + if test -n "$CC_FOR_TARGET"; then + ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_GCC_FOR_TARGET="${ncn_progname}" + ac_cv_prog_CC_FOR_TARGET="${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET" -if test -n "$GCC_FOR_TARGET"; then - echo "$ac_t""$GCC_FOR_TARGET" 1>&6 +CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET" +if test -n "$CC_FOR_TARGET"; then + echo "$ac_t""$CC_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_GCC_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_GCC_FOR_TARGET" ; then - GCC_FOR_TARGET="${CC_FOR_TARGET}" -fi + fi + test -n "$ac_cv_prog_CC_FOR_TARGET" && break +done - if test -n "$with_build_time_tools"; then - for ncn_progname in gcj; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:4843: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_GCJ_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done +if test -z "$ac_cv_prog_CC_FOR_TARGET" ; then + set dummy cc gcc + if test $build = $target ; then + CC_FOR_TARGET="$2" + else + CC_FOR_TARGET="${ncn_target_tool_prefix}$2" + fi fi -if test -z "$ac_cv_prog_GCJ_FOR_TARGET"; then - for ncn_progname in gcj; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in c++ g++ cxx gxx; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4860: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4698: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$GCJ_FOR_TARGET"; then - ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test. + if test -n "$CXX_FOR_TARGET"; then + ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_GCJ_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_CXX_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET" -if test -n "$GCJ_FOR_TARGET"; then - echo "$ac_t""$GCJ_FOR_TARGET" 1>&6 +CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET" +if test -n "$CXX_FOR_TARGET"; then + echo "$ac_t""$CXX_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_GCJ_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_CXX_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4891: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4729: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$GCJ_FOR_TARGET"; then - ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test. + if test -n "$CXX_FOR_TARGET"; then + ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_GCJ_FOR_TARGET="${ncn_progname}" + ac_cv_prog_CXX_FOR_TARGET="${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET" -if test -n "$GCJ_FOR_TARGET"; then - echo "$ac_t""$GCJ_FOR_TARGET" 1>&6 +CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET" +if test -n "$CXX_FOR_TARGET"; then + echo "$ac_t""$CXX_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_GCJ_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_GCJ_FOR_TARGET" ; then - set dummy gcj + fi + test -n "$ac_cv_prog_CXX_FOR_TARGET" && break +done + +if test -z "$ac_cv_prog_CXX_FOR_TARGET" ; then + set dummy c++ g++ cxx gxx if test $build = $target ; then - GCJ_FOR_TARGET="$2" + CXX_FOR_TARGET="$2" else - GCJ_FOR_TARGET="${ncn_target_tool_prefix}$2" + CXX_FOR_TARGET="${ncn_target_tool_prefix}$2" fi fi - if test -n "$with_build_time_tools"; then - for ncn_progname in gfortran; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:4934: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_GFORTRAN_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET"; then - for ncn_progname in gfortran; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in dlltool; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4951: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4773: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$GFORTRAN_FOR_TARGET"; then - ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test. + if test -n "$DLLTOOL_FOR_TARGET"; then + ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET" -if test -n "$GFORTRAN_FOR_TARGET"; then - echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6 +DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET" +if test -n "$DLLTOOL_FOR_TARGET"; then + echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4982: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4804: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$GFORTRAN_FOR_TARGET"; then - ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test. + if test -n "$DLLTOOL_FOR_TARGET"; then + ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_progname}" + ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET" -if test -n "$GFORTRAN_FOR_TARGET"; then - echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6 +DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET" +if test -n "$DLLTOOL_FOR_TARGET"; then + echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_GFORTRAN_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" ; then - set dummy gfortran - if test $build = $target ; then - GFORTRAN_FOR_TARGET="$2" - else - GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}$2" fi -fi - - + test -n "$ac_cv_prog_DLLTOOL_FOR_TARGET" && break +done -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then + set dummy dlltool + if test $build = $target ; then + DLLTOOL_FOR_TARGET="$2" else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - - -if test "x$exec_prefix" = xNONE; then - if test "x$prefix" = xNONE; then - gcc_cv_tool_prefix=$ac_default_prefix - else - gcc_cv_tool_prefix=$prefix - fi -else - gcc_cv_tool_prefix=$exec_prefix -fi - -# If there is no compiler in the tree, use the PATH only. In any -# case, if there is no compiler in the tree nobody should use -# AS_FOR_TARGET and LD_FOR_TARGET. -if test x$host = x$build && test -f $srcdir/gcc/BASE-VER; then - gcc_version=`cat $srcdir/gcc/BASE-VER` - gcc_cv_tool_dirs="$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical$PATH_SEPARATOR" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical$PATH_SEPARATOR" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version$PATH_SEPARATOR" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin$PATH_SEPARATOR" -else - gcc_cv_tool_dirs= -fi - -if test x$build = x$target && test -n "$md_exec_prefix"; then - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$md_exec_prefix$PATH_SEPARATOR" -fi - - - -cat > conftest.c << \EOF -#ifdef __GNUC__ - gcc_yay; -#endif -EOF -if ($GCC_FOR_TARGET -E conftest.c | grep gcc_yay) > /dev/null 2>&1; then - have_gcc_for_target=yes -else - GCC_FOR_TARGET=${ncn_target_tool_prefix}gcc - have_gcc_for_target=no -fi -rm conftest.c - - - - -if test -z "$ac_cv_path_AR_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for ar in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5089: checking for ar in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/ar; then - AR_FOR_TARGET=`cd $with_build_time_tools && pwd`/ar - ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET - echo "$ac_t""$ac_cv_path_AR_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - AR_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ar` - test $AR_FOR_TARGET=ar && AR_FOR_TARGET= - ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET + DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}$2" fi fi -if test -z "$ac_cv_path_AR_FOR_TARGET" ; then - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5107: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$AR_FOR_TARGET" in - /*) - ac_cv_path_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_AR_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -AR_FOR_TARGET="$ac_cv_path_AR_FOR_TARGET" -if test -n "$AR_FOR_TARGET"; then - echo "$ac_t""$AR_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -fi -if test -z "$ac_cv_path_AR_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in ar; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5144: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_AR_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_AR_FOR_TARGET"; then - for ncn_progname in ar; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in gcc; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5161: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4848: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$AR_FOR_TARGET"; then - ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test. + if test -n "$GCC_FOR_TARGET"; then + ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_AR_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_GCC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET" -if test -n "$AR_FOR_TARGET"; then - echo "$ac_t""$AR_FOR_TARGET" 1>&6 +GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET" +if test -n "$GCC_FOR_TARGET"; then + echo "$ac_t""$GCC_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_AR_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_GCC_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5192: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4879: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$AR_FOR_TARGET"; then - ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test. + if test -n "$GCC_FOR_TARGET"; then + ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_AR_FOR_TARGET="${ncn_progname}" + ac_cv_prog_GCC_FOR_TARGET="${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET" -if test -n "$AR_FOR_TARGET"; then - echo "$ac_t""$AR_FOR_TARGET" 1>&6 +GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET" +if test -n "$GCC_FOR_TARGET"; then + echo "$ac_t""$GCC_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_AR_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then - set dummy ar - if test $build = $target ; then - AR_FOR_TARGET="$2" - else - AR_FOR_TARGET="${ncn_target_tool_prefix}$2" fi -fi - -else - AR_FOR_TARGET=$ac_cv_path_AR_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_AS_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for as in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5242: checking for as in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/as; then - AS_FOR_TARGET=`cd $with_build_time_tools && pwd`/as - ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET - echo "$ac_t""$ac_cv_path_AS_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - AS_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=as` - test $AS_FOR_TARGET=as && AS_FOR_TARGET= - ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_AS_FOR_TARGET" ; 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:5260: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$AS_FOR_TARGET" in - /*) - ac_cv_path_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_AS_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -AS_FOR_TARGET="$ac_cv_path_AS_FOR_TARGET" -if test -n "$AS_FOR_TARGET"; then - echo "$ac_t""$AS_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi + test -n "$ac_cv_prog_GCC_FOR_TARGET" && break +done -fi -if test -z "$ac_cv_path_AS_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in as; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5297: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_AS_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done +if test -z "$ac_cv_prog_GCC_FOR_TARGET" ; then + GCC_FOR_TARGET="${CC_FOR_TARGET}" fi -if test -z "$ac_cv_prog_AS_FOR_TARGET"; then - for ncn_progname in as; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in gcj; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5314: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4918: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$AS_FOR_TARGET"; then - ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test. + if test -n "$GCJ_FOR_TARGET"; then + ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_AS_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_GCJ_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET" -if test -n "$AS_FOR_TARGET"; then - echo "$ac_t""$AS_FOR_TARGET" 1>&6 +GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET" +if test -n "$GCJ_FOR_TARGET"; then + echo "$ac_t""$GCJ_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_AS_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_GCJ_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5345: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4949: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$AS_FOR_TARGET"; then - ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test. + if test -n "$GCJ_FOR_TARGET"; then + ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_AS_FOR_TARGET="${ncn_progname}" + ac_cv_prog_GCJ_FOR_TARGET="${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET" -if test -n "$AS_FOR_TARGET"; then - echo "$ac_t""$AS_FOR_TARGET" 1>&6 +GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET" +if test -n "$GCJ_FOR_TARGET"; then + echo "$ac_t""$GCJ_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_AS_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then - set dummy as + fi + test -n "$ac_cv_prog_GCJ_FOR_TARGET" && break +done + +if test -z "$ac_cv_prog_GCJ_FOR_TARGET" ; then + set dummy gcj if test $build = $target ; then - AS_FOR_TARGET="$2" + GCJ_FOR_TARGET="$2" else - AS_FOR_TARGET="${ncn_target_tool_prefix}$2" + GCJ_FOR_TARGET="${ncn_target_tool_prefix}$2" fi fi -else - AS_FOR_TARGET=$ac_cv_path_AS_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for dlltool in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5395: checking for dlltool in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/dlltool; then - DLLTOOL_FOR_TARGET=`cd $with_build_time_tools && pwd`/dlltool - ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET - echo "$ac_t""$ac_cv_path_DLLTOOL_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - DLLTOOL_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=dlltool` - test $DLLTOOL_FOR_TARGET=dlltool && DLLTOOL_FOR_TARGET= - ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; 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:5413: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$DLLTOOL_FOR_TARGET" in - /*) - ac_cv_path_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_DLLTOOL_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -DLLTOOL_FOR_TARGET="$ac_cv_path_DLLTOOL_FOR_TARGET" -if test -n "$DLLTOOL_FOR_TARGET"; then - echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -fi -if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in dlltool; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5450: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_DLLTOOL_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET"; then - for ncn_progname in dlltool; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in gfortran; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5467: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4993: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$DLLTOOL_FOR_TARGET"; then - ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test. + if test -n "$GFORTRAN_FOR_TARGET"; then + ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET" -if test -n "$DLLTOOL_FOR_TARGET"; then - echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6 +GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET" +if test -n "$GFORTRAN_FOR_TARGET"; then + echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5498: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then +echo "configure:5024: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$DLLTOOL_FOR_TARGET"; then - ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test. + if test -n "$GFORTRAN_FOR_TARGET"; then + ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_progname}" + ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_progname}" break fi done IFS="$ac_save_ifs" fi fi -DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET" -if test -n "$DLLTOOL_FOR_TARGET"; then - echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6 +GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET" +if test -n "$GFORTRAN_FOR_TARGET"; then + echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_DLLTOOL_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then - set dummy dlltool + fi + test -n "$ac_cv_prog_GFORTRAN_FOR_TARGET" && break +done + +if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" ; then + set dummy gfortran if test $build = $target ; then - DLLTOOL_FOR_TARGET="$2" + GFORTRAN_FOR_TARGET="$2" else - DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}$2" + GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}$2" fi fi -else - DLLTOOL_FOR_TARGET=$ac_cv_path_DLLTOOL_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_LD_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for ld in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5548: checking for ld in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/ld; then - LD_FOR_TARGET=`cd $with_build_time_tools && pwd`/ld - ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET - echo "$ac_t""$ac_cv_path_LD_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - LD_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ld` - test $LD_FOR_TARGET=ld && LD_FOR_TARGET= - ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_LD_FOR_TARGET" ; then - # Extract the first word of "ld", so it can be a program name with args. -set dummy ld; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5566: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$LD_FOR_TARGET" in - /*) - ac_cv_path_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_LD_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -LD_FOR_TARGET="$ac_cv_path_LD_FOR_TARGET" -if test -n "$LD_FOR_TARGET"; then - echo "$ac_t""$LD_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -fi -if test -z "$ac_cv_path_LD_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in ld; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5603: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_LD_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_LD_FOR_TARGET"; then - for ncn_progname in ld; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in ld; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5620: checking for $ac_word" >&5 +echo "configure:5068: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5642,12 +5090,12 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_LD_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_LD_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5651: checking for $ac_word" >&5 +echo "configure:5099: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5673,11 +5121,10 @@ else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_LD_FOR_TARGET" && break - done -fi - + fi + test -n "$ac_cv_prog_LD_FOR_TARGET" && break +done + if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then set dummy ld if test $build = $target ; then @@ -5687,89 +5134,12 @@ if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then fi fi -else - LD_FOR_TARGET=$ac_cv_path_LD_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for lipo in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5701: checking for lipo in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/lipo; then - LIPO_FOR_TARGET=`cd $with_build_time_tools && pwd`/lipo - ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET - echo "$ac_t""$ac_cv_path_LIPO_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - LIPO_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=lipo` - test $LIPO_FOR_TARGET=lipo && LIPO_FOR_TARGET= - ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then - # Extract the first word of "lipo", so it can be a program name with args. -set dummy lipo; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5719: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_LIPO_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$LIPO_FOR_TARGET" in - /*) - ac_cv_path_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_LIPO_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -LIPO_FOR_TARGET="$ac_cv_path_LIPO_FOR_TARGET" -if test -n "$LIPO_FOR_TARGET"; then - echo "$ac_t""$LIPO_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -fi -if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in lipo; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5756: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_LIPO_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_LIPO_FOR_TARGET"; then - for ncn_progname in lipo; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in lipo; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5773: checking for $ac_word" >&5 +echo "configure:5143: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5795,12 +5165,12 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_LIPO_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_LIPO_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5804: checking for $ac_word" >&5 +echo "configure:5174: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5826,11 +5196,10 @@ else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_LIPO_FOR_TARGET" && break - done -fi - + fi + test -n "$ac_cv_prog_LIPO_FOR_TARGET" && break +done + if test -z "$ac_cv_prog_LIPO_FOR_TARGET" ; then set dummy lipo if test $build = $target ; then @@ -5840,89 +5209,12 @@ if test -z "$ac_cv_prog_LIPO_FOR_TARGET" ; then fi fi -else - LIPO_FOR_TARGET=$ac_cv_path_LIPO_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_NM_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for nm in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5854: checking for nm in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/nm; then - NM_FOR_TARGET=`cd $with_build_time_tools && pwd`/nm - ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET - echo "$ac_t""$ac_cv_path_NM_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - NM_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=nm` - test $NM_FOR_TARGET=nm && NM_FOR_TARGET= - ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_NM_FOR_TARGET" ; then - # Extract the first word of "nm", so it can be a program name with args. -set dummy nm; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5872: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$NM_FOR_TARGET" in - /*) - ac_cv_path_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_NM_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -NM_FOR_TARGET="$ac_cv_path_NM_FOR_TARGET" -if test -n "$NM_FOR_TARGET"; then - echo "$ac_t""$NM_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -fi -if test -z "$ac_cv_path_NM_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in nm; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:5909: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_NM_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_NM_FOR_TARGET"; then - for ncn_progname in nm; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in nm; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5926: checking for $ac_word" >&5 +echo "configure:5218: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5948,12 +5240,12 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_NM_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_NM_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5957: checking for $ac_word" >&5 +echo "configure:5249: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5979,11 +5271,10 @@ else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_NM_FOR_TARGET" && break - done -fi - + fi + test -n "$ac_cv_prog_NM_FOR_TARGET" && break +done + if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then set dummy nm if test $build = $target ; then @@ -5993,89 +5284,12 @@ if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then fi fi -else - NM_FOR_TARGET=$ac_cv_path_NM_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for objdump in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6007: checking for objdump in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/objdump; then - OBJDUMP_FOR_TARGET=`cd $with_build_time_tools && pwd`/objdump - ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET - echo "$ac_t""$ac_cv_path_OBJDUMP_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - OBJDUMP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=objdump` - test $OBJDUMP_FOR_TARGET=objdump && OBJDUMP_FOR_TARGET= - ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; 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:6025: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$OBJDUMP_FOR_TARGET" in - /*) - ac_cv_path_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_OBJDUMP_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -OBJDUMP_FOR_TARGET="$ac_cv_path_OBJDUMP_FOR_TARGET" -if test -n "$OBJDUMP_FOR_TARGET"; then - echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -fi -if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in objdump; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6062: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_OBJDUMP_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET"; then - for ncn_progname in objdump; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in objdump; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6079: checking for $ac_word" >&5 +echo "configure:5293: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6101,12 +5315,12 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6110: checking for $ac_word" >&5 +echo "configure:5324: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6132,11 +5346,10 @@ else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_OBJDUMP_FOR_TARGET" && break - done -fi - + fi + test -n "$ac_cv_prog_OBJDUMP_FOR_TARGET" && break +done + if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" ; then set dummy objdump if test $build = $target ; then @@ -6146,89 +5359,12 @@ if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" ; then fi fi -else - OBJDUMP_FOR_TARGET=$ac_cv_path_OBJDUMP_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for ranlib in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6160: checking for ranlib in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/ranlib; then - RANLIB_FOR_TARGET=`cd $with_build_time_tools && pwd`/ranlib - ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET - echo "$ac_t""$ac_cv_path_RANLIB_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - RANLIB_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ranlib` - test $RANLIB_FOR_TARGET=ranlib && RANLIB_FOR_TARGET= - ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; 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:6178: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$RANLIB_FOR_TARGET" in - /*) - ac_cv_path_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_RANLIB_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -RANLIB_FOR_TARGET="$ac_cv_path_RANLIB_FOR_TARGET" -if test -n "$RANLIB_FOR_TARGET"; then - echo "$ac_t""$RANLIB_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -fi -if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in ranlib; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6215: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_RANLIB_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_RANLIB_FOR_TARGET"; then - for ncn_progname in ranlib; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in ranlib; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6232: checking for $ac_word" >&5 +echo "configure:5368: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6254,12 +5390,12 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6263: checking for $ac_word" >&5 +echo "configure:5399: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6285,103 +5421,20 @@ else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_RANLIB_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then - set dummy ranlib - if test $build = $target ; then - RANLIB_FOR_TARGET="$2" - else - RANLIB_FOR_TARGET="${ncn_target_tool_prefix}$2" - fi -fi - -else - RANLIB_FOR_TARGET=$ac_cv_path_RANLIB_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for strip in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6313: checking for strip in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/strip; then - STRIP_FOR_TARGET=`cd $with_build_time_tools && pwd`/strip - ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET - echo "$ac_t""$ac_cv_path_STRIP_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - STRIP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=strip` - test $STRIP_FOR_TARGET=strip && STRIP_FOR_TARGET= - ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET fi -fi -if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; 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:6331: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$STRIP_FOR_TARGET" in - /*) - ac_cv_path_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_STRIP_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -STRIP_FOR_TARGET="$ac_cv_path_STRIP_FOR_TARGET" -if test -n "$STRIP_FOR_TARGET"; then - echo "$ac_t""$STRIP_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi + test -n "$ac_cv_prog_RANLIB_FOR_TARGET" && break +done -fi -if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in strip; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6368: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_STRIP_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done +if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then + RANLIB_FOR_TARGET=":" fi -if test -z "$ac_cv_prog_STRIP_FOR_TARGET"; then - for ncn_progname in strip; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in strip; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6385: checking for $ac_word" >&5 +echo "configure:5438: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6407,12 +5460,12 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_STRIP_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_STRIP_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6416: checking for $ac_word" >&5 +echo "configure:5469: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6438,11 +5491,10 @@ else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_STRIP_FOR_TARGET" && break - done -fi - + fi + test -n "$ac_cv_prog_STRIP_FOR_TARGET" && break +done + if test -z "$ac_cv_prog_STRIP_FOR_TARGET" ; then set dummy strip if test $build = $target ; then @@ -6452,89 +5504,12 @@ if test -z "$ac_cv_prog_STRIP_FOR_TARGET" ; then fi fi -else - STRIP_FOR_TARGET=$ac_cv_path_STRIP_FOR_TARGET -fi - - - - -if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - echo $ac_n "checking for windres in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6466: checking for windres in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/windres; then - WINDRES_FOR_TARGET=`cd $with_build_time_tools && pwd`/windres - ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET - echo "$ac_t""$ac_cv_path_WINDRES_FOR_TARGET" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - WINDRES_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=windres` - test $WINDRES_FOR_TARGET=windres && WINDRES_FOR_TARGET= - ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then - # Extract the first word of "windres", so it can be a program name with args. -set dummy windres; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6484: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_WINDRES_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$WINDRES_FOR_TARGET" in - /*) - ac_cv_path_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$gcc_cv_tool_dirs" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_WINDRES_FOR_TARGET="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -WINDRES_FOR_TARGET="$ac_cv_path_WINDRES_FOR_TARGET" -if test -n "$WINDRES_FOR_TARGET"; then - echo "$ac_t""$WINDRES_FOR_TARGET" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -fi -if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - for ncn_progname in windres; do - echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6 -echo "configure:6521: checking for ${ncn_progname} in $with_build_time_tools" >&5 - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_WINDRES_FOR_TARGET=$with_build_time_tools/${ncn_progname} - echo "$ac_t""yes" 1>&6 - break - else - echo "$ac_t""no" 1>&6 - fi - done -fi - -if test -z "$ac_cv_prog_WINDRES_FOR_TARGET"; then - for ncn_progname in windres; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. + for ncn_progname in windres; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6538: checking for $ac_word" >&5 +echo "configure:5513: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6560,12 +5535,12 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. + fi + if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. set dummy ${ncn_progname}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6569: checking for $ac_word" >&5 +echo "configure:5544: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6591,11 +5566,10 @@ else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_WINDRES_FOR_TARGET" && break - done -fi - + fi + test -n "$ac_cv_prog_WINDRES_FOR_TARGET" && break +done + if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then set dummy windres if test $build = $target ; then @@ -6605,23 +5579,14 @@ if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then fi fi -else - WINDRES_FOR_TARGET=$ac_cv_path_WINDRES_FOR_TARGET -fi - RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET" echo $ac_n "checking where to find the target ar""... $ac_c" 1>&6 -echo "configure:6617: checking where to find the target ar" >&5 +echo "configure:5587: checking where to find the target ar" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$AR_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $AR_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6633,9 +5598,6 @@ else # An in-tree tool is available and we can use it AR_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/ar' echo "$ac_t""just compiled" 1>&6 - elif expr "x$AR_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $AR_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool AR_FOR_TARGET='$(AR)' @@ -6646,15 +5608,10 @@ else fi fi echo $ac_n "checking where to find the target as""... $ac_c" 1>&6 -echo "configure:6650: checking where to find the target as" >&5 +echo "configure:5612: checking where to find the target as" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$AS_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $AS_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6666,9 +5623,6 @@ else # An in-tree tool is available and we can use it AS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gas/as-new' echo "$ac_t""just compiled" 1>&6 - elif expr "x$AS_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $AS_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool AS_FOR_TARGET='$(AS)' @@ -6679,15 +5633,10 @@ else fi fi echo $ac_n "checking where to find the target cc""... $ac_c" 1>&6 -echo "configure:6683: checking where to find the target cc" >&5 +echo "configure:5637: checking where to find the target cc" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$CC_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $CC_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6699,9 +5648,6 @@ else # An in-tree tool is available and we can use it CC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/' echo "$ac_t""just compiled" 1>&6 - elif expr "x$CC_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $CC_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool CC_FOR_TARGET='$(CC)' @@ -6712,15 +5658,10 @@ else fi fi echo $ac_n "checking where to find the target c++""... $ac_c" 1>&6 -echo "configure:6716: checking where to find the target c++" >&5 +echo "configure:5662: checking where to find the target c++" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $CXX_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6735,9 +5676,6 @@ else # An in-tree tool is available and we can use it CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' echo "$ac_t""just compiled" 1>&6 - elif expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $CXX_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool CXX_FOR_TARGET='$(CXX)' @@ -6748,15 +5686,10 @@ else fi fi echo $ac_n "checking where to find the target c++ for libstdc++""... $ac_c" 1>&6 -echo "configure:6752: checking where to find the target c++ for libstdc++" >&5 +echo "configure:5690: checking where to find the target c++ for libstdc++" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $RAW_CXX_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6771,9 +5704,6 @@ else # An in-tree tool is available and we can use it RAW_CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' echo "$ac_t""just compiled" 1>&6 - elif expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $RAW_CXX_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool RAW_CXX_FOR_TARGET='$(CXX)' @@ -6784,15 +5714,10 @@ else fi fi echo $ac_n "checking where to find the target dlltool""... $ac_c" 1>&6 -echo "configure:6788: checking where to find the target dlltool" >&5 +echo "configure:5718: checking where to find the target dlltool" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$DLLTOOL_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $DLLTOOL_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6804,9 +5729,6 @@ else # An in-tree tool is available and we can use it DLLTOOL_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/dlltool' echo "$ac_t""just compiled" 1>&6 - elif expr "x$DLLTOOL_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $DLLTOOL_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool DLLTOOL_FOR_TARGET='$(DLLTOOL)' @@ -6817,15 +5739,10 @@ else fi fi echo $ac_n "checking where to find the target gcc""... $ac_c" 1>&6 -echo "configure:6821: checking where to find the target gcc" >&5 +echo "configure:5743: checking where to find the target gcc" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$GCC_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GCC_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6837,9 +5754,6 @@ else # An in-tree tool is available and we can use it GCC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/' echo "$ac_t""just compiled" 1>&6 - elif expr "x$GCC_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GCC_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool GCC_FOR_TARGET='$()' @@ -6850,15 +5764,10 @@ else fi fi echo $ac_n "checking where to find the target gcj""... $ac_c" 1>&6 -echo "configure:6854: checking where to find the target gcj" >&5 +echo "configure:5768: checking where to find the target gcj" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GCJ_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6873,9 +5782,6 @@ else # An in-tree tool is available and we can use it GCJ_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/' echo "$ac_t""just compiled" 1>&6 - elif expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GCJ_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool GCJ_FOR_TARGET='$(GCJ)' @@ -6886,15 +5792,10 @@ else fi fi echo $ac_n "checking where to find the target gfortran""... $ac_c" 1>&6 -echo "configure:6890: checking where to find the target gfortran" >&5 +echo "configure:5796: checking where to find the target gfortran" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$GFORTRAN_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GFORTRAN_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6909,9 +5810,6 @@ else # An in-tree tool is available and we can use it GFORTRAN_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/' echo "$ac_t""just compiled" 1>&6 - elif expr "x$GFORTRAN_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $GFORTRAN_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool GFORTRAN_FOR_TARGET='$(GFORTRAN)' @@ -6922,15 +5820,10 @@ else fi fi echo $ac_n "checking where to find the target ld""... $ac_c" 1>&6 -echo "configure:6926: checking where to find the target ld" >&5 +echo "configure:5824: checking where to find the target ld" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$LD_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $LD_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6942,9 +5835,6 @@ else # An in-tree tool is available and we can use it LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/ld/ld-new' echo "$ac_t""just compiled" 1>&6 - elif expr "x$LD_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $LD_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool LD_FOR_TARGET='$(LD)' @@ -6955,20 +5845,12 @@ else fi fi echo $ac_n "checking where to find the target lipo""... $ac_c" 1>&6 -echo "configure:6959: checking where to find the target lipo" >&5 +echo "configure:5849: checking where to find the target lipo" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$LIPO_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $LIPO_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else - if expr "x$LIPO_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $LIPO_FOR_TARGET`" 1>&6 - elif test "x$target" = "x$host"; then + if test "x$target" = "x$host"; then # We can use an host tool LIPO_FOR_TARGET='$(LIPO)' echo "$ac_t""host tool" 1>&6 @@ -6978,15 +5860,10 @@ else fi fi echo $ac_n "checking where to find the target nm""... $ac_c" 1>&6 -echo "configure:6982: checking where to find the target nm" >&5 +echo "configure:5864: checking where to find the target nm" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$NM_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $NM_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -6998,9 +5875,6 @@ else # An in-tree tool is available and we can use it NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/nm-new' echo "$ac_t""just compiled" 1>&6 - elif expr "x$NM_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $NM_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool NM_FOR_TARGET='$(NM)' @@ -7011,15 +5885,10 @@ else fi fi echo $ac_n "checking where to find the target objdump""... $ac_c" 1>&6 -echo "configure:7015: checking where to find the target objdump" >&5 +echo "configure:5889: checking where to find the target objdump" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$OBJDUMP_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $OBJDUMP_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -7031,9 +5900,6 @@ else # An in-tree tool is available and we can use it OBJDUMP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/objdump' echo "$ac_t""just compiled" 1>&6 - elif expr "x$OBJDUMP_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $OBJDUMP_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool OBJDUMP_FOR_TARGET='$(OBJDUMP)' @@ -7044,15 +5910,10 @@ else fi fi echo $ac_n "checking where to find the target ranlib""... $ac_c" 1>&6 -echo "configure:7048: checking where to find the target ranlib" >&5 +echo "configure:5914: checking where to find the target ranlib" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$RANLIB_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $RANLIB_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -7064,9 +5925,6 @@ else # An in-tree tool is available and we can use it RANLIB_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/ranlib' echo "$ac_t""just compiled" 1>&6 - elif expr "x$RANLIB_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $RANLIB_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool RANLIB_FOR_TARGET='$(RANLIB)' @@ -7077,15 +5935,10 @@ else fi fi echo $ac_n "checking where to find the target strip""... $ac_c" 1>&6 -echo "configure:7081: checking where to find the target strip" >&5 +echo "configure:5939: checking where to find the target strip" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $STRIP_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -7097,9 +5950,6 @@ else # An in-tree tool is available and we can use it STRIP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/strip' echo "$ac_t""just compiled" 1>&6 - elif expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $STRIP_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool STRIP_FOR_TARGET='$(STRIP)' @@ -7110,15 +5960,10 @@ else fi fi echo $ac_n "checking where to find the target windres""... $ac_c" 1>&6 -echo "configure:7114: checking where to find the target windres" >&5 +echo "configure:5964: checking where to find the target windres" >&5 if test "x${build}" != "x${host}" ; then - if expr "x$WINDRES_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $WINDRES_FOR_TARGET`" 1>&6 - else - # Canadian cross, just use what we found - echo "$ac_t""pre-installed" 1>&6 - fi + # Canadian cross, just use what we found + echo "$ac_t""pre-installed" 1>&6 else ok=yes case " ${configdirs} " in @@ -7130,9 +5975,6 @@ else # An in-tree tool is available and we can use it WINDRES_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/windres' echo "$ac_t""just compiled" 1>&6 - elif expr "x$WINDRES_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - echo "$ac_t""pre-installed in `dirname $WINDRES_FOR_TARGET`" 1>&6 elif test "x$target" = "x$host"; then # We can use an host tool WINDRES_FOR_TARGET='$(WINDRES)' @@ -7171,7 +6013,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:7175: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:6017: 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" @@ -7214,6 +6056,42 @@ case $build in esac +# It makes debugging easier if we create as symlinks the stage directories +# gcc for stageN-gcc and stagePREV-gcc for stage(N-1). In case this is not +# possible, however, we can resort to mv. +echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6 +echo "configure:6064: checking if symbolic links between directories work" >&5 +if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "${LN_S}" = "ln -s" \ + && mkdir confdir.s1 \ + && ln -s confdir.s1 confdir.s2 \ + && echo timestamp1 > confdir.s1/conftest.1 \ + && cmp confdir.s1/conftest.1 confdir.s2/conftest.1 \ + && echo timestamp2 > confdir.s2/conftest.2 \ + && cmp confdir.s1/conftest.2 confdir.s1/conftest.2 \ + && rm -f confdir.s2; then + gcc_cv_prog_ln_s_dir=yes +else + gcc_cv_prog_ln_s_dir=no +fi +rm -rf confdir.s1 confdir.s2 +fi + +echo "$ac_t""$gcc_cv_prog_ln_s_dir" 1>&6 + +case ${gcc_cv_prog_ln_s_dir} in + yes) + CREATE_LINK_TO_DIR='ln -s $$1 $$2' + UNDO_LINK_TO_DIR='rm -f $$1' ;; + *) + CREATE_LINK_TO_DIR='mv $$1 $$2' + UNDO_LINK_TO_DIR='mv $$1 $$2' ;; +esac + + + # Enable -Werror in bootstrap stage2 and later. # Change the default to "no" on release branches. # Check whether --enable-werror or --disable-werror was given. @@ -7406,6 +6284,7 @@ s%@gmplibs@%$gmplibs%g s%@gmpinc@%$gmpinc%g s%@stage1_languages@%$stage1_languages%g s%@SYSROOT_CFLAGS_FOR_TARGET@%$SYSROOT_CFLAGS_FOR_TARGET%g +s%@bootstrap_lean@%$bootstrap_lean%g /@serialization_dependencies@/r $serialization_dependencies s%@serialization_dependencies@%%g /@host_makefile_frag@/r $host_makefile_frag @@ -7417,6 +6296,8 @@ s%@alphaieee_frag@%%g /@ospace_frag@/r $ospace_frag s%@ospace_frag@%%g s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g +s%@BUILD_PREFIX@%$BUILD_PREFIX%g +s%@BUILD_PREFIX_1@%$BUILD_PREFIX_1%g s%@tooldir@%$tooldir%g s%@build_tooldir@%$build_tooldir%g s%@CONFIGURE_GDB_TK@%$CONFIGURE_GDB_TK%g @@ -7427,6 +6308,7 @@ s%@build_configdirs@%$build_configdirs%g s%@host_configargs@%$host_configargs%g s%@configdirs@%$configdirs%g s%@target_configargs@%$target_configargs%g +s%@target_configdirs@%$target_configdirs%g s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g s%@config_shell@%$config_shell%g s%@YACC@%$YACC%g @@ -7450,14 +6332,14 @@ s%@OBJCOPY@%$OBJCOPY%g s%@OBJDUMP@%$OBJDUMP%g s%@CXX@%$CXX%g s%@CFLAGS_FOR_BUILD@%$CFLAGS_FOR_BUILD%g +s%@AR_FOR_TARGET@%$AR_FOR_TARGET%g +s%@AS_FOR_TARGET@%$AS_FOR_TARGET%g s%@CC_FOR_TARGET@%$CC_FOR_TARGET%g s%@CXX_FOR_TARGET@%$CXX_FOR_TARGET%g +s%@DLLTOOL_FOR_TARGET@%$DLLTOOL_FOR_TARGET%g s%@GCC_FOR_TARGET@%$GCC_FOR_TARGET%g s%@GCJ_FOR_TARGET@%$GCJ_FOR_TARGET%g s%@GFORTRAN_FOR_TARGET@%$GFORTRAN_FOR_TARGET%g -s%@AR_FOR_TARGET@%$AR_FOR_TARGET%g -s%@AS_FOR_TARGET@%$AS_FOR_TARGET%g -s%@DLLTOOL_FOR_TARGET@%$DLLTOOL_FOR_TARGET%g s%@LD_FOR_TARGET@%$LD_FOR_TARGET%g s%@LIPO_FOR_TARGET@%$LIPO_FOR_TARGET%g s%@NM_FOR_TARGET@%$NM_FOR_TARGET%g @@ -7474,6 +6356,8 @@ s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g s%@stage1_cflags@%$stage1_cflags%g +s%@CREATE_LINK_TO_DIR@%$CREATE_LINK_TO_DIR%g +s%@UNDO_LINK_TO_DIR@%$UNDO_LINK_TO_DIR%g s%@stage2_werror_flag@%$stage2_werror_flag%g CEOF |