diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4217 |
1 files changed, 920 insertions, 3297 deletions
@@ -14,10 +14,6 @@ ac_default_prefix=/usr/local ac_help="$ac_help --enable-libada Builds libada directory" 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" @@ -26,19 +22,13 @@ ac_help="$ac_help ac_help="$ac_help --with-gmp=PATH Specify directory for installed GMP library" 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 +591,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:595: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -622,7 +612,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:616: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -640,7 +630,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:634: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -695,7 +685,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:689: 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 +738,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:742: 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 +762,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:766: 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 @@ -886,7 +876,7 @@ build_tools="build-texinfo build-byacc build-flex build-bison build-m4 build-fix # these libraries are used by various programs built for the host environment # -host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber" +host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp" # these tools are built for the host environment # Note, the powerpc-eabi build depends on sim occurring before gdb in order to @@ -910,13 +900,10 @@ target_libraries="target-libiberty \ target-newlib \ 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 @@ -1049,10 +1036,6 @@ case "${host}" in configdirs="$configdirs libtermcap" ;; esac -# A target can indicate whether a language isn't supported for some reason. -# Only spaces may be used in this macro; not newlines or tabs. -unsupported_languages= - # Remove more programs from consideration, based on the host or # target this usually means that a port of the program doesn't # exist yet. @@ -1098,35 +1081,10 @@ else fi if test "${ENABLE_LIBADA}" != "yes" ; then + noconfigdirs="$noconfigdirs target-libada" noconfigdirs="$noconfigdirs gnattools" fi -# Check whether --enable-libssp or --disable-libssp was given. -if test "${enable_libssp+set}" = set; then - enableval="$enable_libssp" - ENABLE_LIBSSP=$enableval -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 - -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 +1102,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 +1122,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 @@ -1185,11 +1131,9 @@ case "${target}" in ;; powerpc-*-darwin*) noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" ;; *-*-darwin*) - noconfigdirs="$noconfigdirs ld gas gdb gprof" - noconfigdirs="$noconfigdirs sim target-rda" + noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof" noconfigdirs="$noconfigdirs ${libgcj}" ;; *-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*) @@ -1237,18 +1181,11 @@ case "${target}" in *-*-rtems*) noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;; - # The tpf target doesn't support gdb yet. - *-*-tpf*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty ${libgcj} target-libmudflap gdb tcl tk libgui itcl" - ;; *-*-uclinux*) noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda ${libgcj}" ;; *-*-vxworks*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty target-libstdc++-v3 ${libgcj}" - ;; - m32c-*-*) - noconfigdirs="$noconfigdirs target-libstdc++-v3" + noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty ${libgcj}" ;; alpha*-dec-osf*) # ld works, but does not support shared libraries. @@ -1299,10 +1236,6 @@ case "${target}" in arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* ) noconfigdirs="$noconfigdirs target-libffi target-qthreads" ;; - arm*-*-linux-gnueabi) - noconfigdirs="$noconfigdirs target-libffi target-qthreads" - noconfigdirs="$noconfigdirs target-libjava target-libobjc" - ;; arm*-*-symbianelf*) noconfigdirs="$noconfigdirs ${libgcj} target-libiberty" ;; @@ -1324,12 +1257,6 @@ case "${target}" in avr-*-*) noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}" ;; - bfin-*-*) - noconfigdirs="$noconfigdirs target-libgloss gdb" - if test x${is_cross_compiler} != xno ; then - target_configdirs="${target_configdirs} target-bsp target-cygmon" - fi - ;; c4x-*-* | tic4x-*-*) noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}" ;; @@ -1337,18 +1264,15 @@ case "${target}" in noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj} gcc gdb newlib" ;; cris-*-* | crisv32-*-*) - unsupported_languages="$unsupported_languages java" + libgcj_ex_libffi=`echo ${libgcj} | sed -e 's/target-libffi//'` case "${target}" in *-*-aout) - unsupported_languages="$unsupported_languages fortran" - noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";; + noconfigdirs="$noconfigdirs ${libgcj}";; *-*-elf) - unsupported_languages="$unsupported_languages fortran" - noconfigdirs="$noconfigdirs target-boehm-gc";; + noconfigdirs="$noconfigdirs ${libgcj_ex_libffi}";; *-*-linux*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss";; + noconfigdirs="$noconfigdirs ${libgcj_ex_libffi} target-newlib target-libgloss";; *) - unsupported_languages="$unsupported_languages fortran" noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss";; esac ;; @@ -1480,9 +1404,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}" ;; @@ -1501,8 +1422,7 @@ case "${target}" in noconfigdirs="$noconfigdirs target-libstdc++-v3" ;; mmix-*-*) - noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb libgloss" - unsupported_languages="$unsupported_languages fortran java" + noconfigdirs="$noconfigdirs ${libgcj} gdb libgloss target-libgfortran" ;; mn10200-*-*) noconfigdirs="$noconfigdirs ${libgcj}" @@ -1510,12 +1430,9 @@ case "${target}" in mn10300-*-*) noconfigdirs="$noconfigdirs ${libgcj}" ;; - mt-*-*) - noconfigdirs="$noconfigdirs sim" - ;; powerpc-*-aix*) # copied from rs6000-*-* entry - noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp ${libgcj}" + noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}" ;; powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe) target_configdirs="$target_configdirs target-winsup" @@ -1539,7 +1456,7 @@ case "${target}" in noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}" ;; rs6000-*-aix*) - noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp ${libgcj}" + noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}" ;; rs6000-*-*) noconfigdirs="$noconfigdirs gprof ${libgcj}" @@ -1794,12 +1711,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 +1754,12 @@ if test "${build}" != "${host}" ; then CXX=${CXX-${host_alias}-c++} CXXFLAGS=${CXXFLAGS-"-g -O2"} CC_FOR_BUILD=${CC_FOR_BUILD-gcc} + CC_FOR_TARGET=${CC_FOR_TARGET-${target_alias}-gcc} + CXX_FOR_TARGET=${CXX_FOR_TARGET-${target_alias}-c++} + GCJ_FOR_TARGET=${GCJ_FOR_TARGET-${target_alias}-gcj} + GCC_FOR_TARGET=${GCC_FOR_TARGET-${CC_FOR_TARGET-${target_alias}-gcc}} + BUILD_PREFIX=${build_alias}- + BUILD_PREFIX_1=${build_alias}- else # Set reasonable default values for some tools even if not Canadian. @@ -1854,10 +1771,14 @@ else # This is all going to change when we autoconfiscate... CC_FOR_BUILD="\$(CC)" + GCC_FOR_TARGET="\$(USUAL_GCC_FOR_TARGET)" + 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:1782: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1887,7 +1808,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:1812: 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 +1859,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:1863: 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 +1891,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:1895: 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 +1902,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1985 "configure" +#line 1906 "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:1911: \"$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 +1933,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:1937: 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:1942: 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 +1947,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:1951: \"$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 +1966,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:1970: 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 +2033,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:2037: 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 +2065,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:2069: 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 +2098,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:2102: 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 +2130,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:2134: 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 @@ -2253,7 +2174,7 @@ fi if test "x$with_mpfr_dir" != x; then - gmpinc="-I$with_mpfr_dir" + gmpinc="-I$with_mpfr_dir/mpfr" gmplibs="$with_mpfr_dir/libmpfr.a" else gmplibs="-lmpfr" @@ -2307,9 +2228,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:2232: checking for correct version of gmp.h" >&5 cat > conftest.$ac_ext <<EOF -#line 2313 "configure" +#line 2234 "configure" #include "confdefs.h" #include "gmp.h" int main() { @@ -2320,7 +2241,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:2245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -2333,12 +2254,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:2258: checking for MPFR" >&5 saved_LIBS="$LIBS" LIBS="$LIBS $gmplibs" cat > conftest.$ac_ext <<EOF -#line 2342 "configure" +#line 2263 "configure" #include "confdefs.h" #include <gmp.h> #include <mpfr.h> @@ -2346,7 +2267,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:2271: \"$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 @@ -2391,15 +2312,6 @@ if test -d ${srcdir}/gcc; then fi enable_languages=`echo "${enable_languages}" | sed -e 's/[ ,][ ,]*/,/g' -e 's/,$//'` - # 'f95' is the old name for the 'fortran' language. We issue a warning - # and make the substitution. - case ,${enable_languages}, in - *,f95,*) - echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2 - enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'` - ;; - esac - # First scan to see if an enabled language requires some other language. # We assume that a given config-lang.in will list all the language # front ends it requires, even if some are required indirectly. @@ -2488,14 +2400,7 @@ if test -d ${srcdir}/gcc; then add_this_lang=no ;; esac - - # Disable a language that is unsupported by the target. - case " $unsupported_languages " in - *" $language "*) - add_this_lang=no - ;; - esac - + case $add_this_lang in no) # Remove language-dependent dirs. @@ -2519,8 +2424,8 @@ if test -d ${srcdir}/gcc; then missing_languages=`echo "$missing_languages" | sed -e "s/^,//" -e "s/,$//"` if test "x$missing_languages" != x; then { echo "configure: error: -The following requested languages could not be built: ${missing_languages} -Recognised languages are: ${potential_languages}" 1>&2; exit 1; } +The following requested languages were not found: ${missing_languages} +The available languages are: ${potential_languages}" 1>&2; exit 1; } fi if test "x$new_enable_languages" != "x$enable_languages"; then @@ -2530,14 +2435,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. @@ -2665,18 +2562,6 @@ esac copy_dirs= -# Check whether --with-build-sysroot or --without-build-sysroot was given. -if test "${with_build_sysroot+set}" = set; then - withval="$with_build_sysroot" - if test x"$withval" != x ; then - SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval" - fi -else - SYSROOT_CFLAGS_FOR_TARGET= -fi - - - # Handle --with-headers=XXX. If the value is not "yes", the contents of # the named directory are copied to $(tooldir)/sys-include. if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then @@ -2714,39 +2599,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 +2630,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 +2687,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 @@ -2909,6 +2745,221 @@ esac tooldir='${exec_prefix}'/${target_alias} build_tooldir=${tooldir} +# Generate default definitions for YACC, M4, LEX and other programs that run +# on the build machine. These are used if the Makefile can't locate these +# programs in objdir. +MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing +for ac_prog in bison +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:2758: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_BISON'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CONFIGURED_BISON"; then + ac_cv_prog_CONFIGURED_BISON="$CONFIGURED_BISON" # 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_CONFIGURED_BISON="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CONFIGURED_BISON="$ac_cv_prog_CONFIGURED_BISON" +if test -n "$CONFIGURED_BISON"; then + echo "$ac_t""$CONFIGURED_BISON" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$CONFIGURED_BISON" && break +done +test -n "$CONFIGURED_BISON" || CONFIGURED_BISON="$MISSING bison" + +for ac_prog in 'bison -y' byacc yacc +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:2793: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_YACC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CONFIGURED_YACC"; then + ac_cv_prog_CONFIGURED_YACC="$CONFIGURED_YACC" # 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_CONFIGURED_YACC="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CONFIGURED_YACC="$ac_cv_prog_CONFIGURED_YACC" +if test -n "$CONFIGURED_YACC"; then + echo "$ac_t""$CONFIGURED_YACC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$CONFIGURED_YACC" && break +done +test -n "$CONFIGURED_YACC" || CONFIGURED_YACC="$MISSING bison -y" + +for ac_prog in gm4 gnum4 m4 +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:2828: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_M4'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CONFIGURED_M4"; then + ac_cv_prog_CONFIGURED_M4="$CONFIGURED_M4" # 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_CONFIGURED_M4="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CONFIGURED_M4="$ac_cv_prog_CONFIGURED_M4" +if test -n "$CONFIGURED_M4"; then + echo "$ac_t""$CONFIGURED_M4" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$CONFIGURED_M4" && break +done +test -n "$CONFIGURED_M4" || CONFIGURED_M4="$MISSING m4" + +for ac_prog in flex +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:2863: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_FLEX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CONFIGURED_FLEX"; then + ac_cv_prog_CONFIGURED_FLEX="$CONFIGURED_FLEX" # 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_CONFIGURED_FLEX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CONFIGURED_FLEX="$ac_cv_prog_CONFIGURED_FLEX" +if test -n "$CONFIGURED_FLEX"; then + echo "$ac_t""$CONFIGURED_FLEX" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$CONFIGURED_FLEX" && break +done +test -n "$CONFIGURED_FLEX" || CONFIGURED_FLEX="$MISSING flex" + +for ac_prog in flex lex +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:2898: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LEX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CONFIGURED_LEX"; then + ac_cv_prog_CONFIGURED_LEX="$CONFIGURED_LEX" # 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_CONFIGURED_LEX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CONFIGURED_LEX="$ac_cv_prog_CONFIGURED_LEX" +if test -n "$CONFIGURED_LEX"; then + echo "$ac_t""$CONFIGURED_LEX" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$CONFIGURED_LEX" && break +done +test -n "$CONFIGURED_LEX" || CONFIGURED_LEX="$MISSING flex" + +for ac_prog in makeinfo +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:2933: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_MAKEINFO'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CONFIGURED_MAKEINFO"; then + ac_cv_prog_CONFIGURED_MAKEINFO="$CONFIGURED_MAKEINFO" # 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_CONFIGURED_MAKEINFO="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CONFIGURED_MAKEINFO="$ac_cv_prog_CONFIGURED_MAKEINFO" +if test -n "$CONFIGURED_MAKEINFO"; then + echo "$ac_t""$CONFIGURED_MAKEINFO" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$CONFIGURED_MAKEINFO" && break +done +test -n "$CONFIGURED_MAKEINFO" || CONFIGURED_MAKEINFO="$MISSING makeinfo" + + # Create a .gdbinit file which runs the one in srcdir # and tells GDB to look there for source files. @@ -3011,8 +3062,6 @@ case "$enable_gdbtk" in fi ;; esac -CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g` -INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g` # Strip out unwanted targets. @@ -3045,26 +3094,27 @@ esac case "$have_compiler:$host:$target:$enable_bootstrap" in *:*:*:no) ;; - # Default behavior. Enable bootstrap if we have a compiler + # Default behavior. (We'll) enable bootstrap if we have a compiler # and we are in a native configuration. yes:$build:$build:default) - enable_bootstrap=yes ;; + # This will become 'yes' + enable_bootstrap=no ;; *:*:*:default) 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 +3126,20 @@ esac # Adjust the toplevel makefile according to whether bootstrap was selected. case "$enable_bootstrap" in yes) + bootstrap_lean='#' + default_target=bootstrap + bootstrap_suffix=bootstrap ;; + lean) + bootstrap_lean='' + default_target=bootstrap bootstrap_suffix=bootstrap ;; no) + default_target=all 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 +3153,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 @@ -3275,10 +3331,8 @@ fi # fixed in future. It's still worthwhile to use a cache file for each # directory. I think. -# Pass the appropriate --build, --host, --target and --cache-file arguments. -# We need to pass --target, as newer autoconf's requires consistency -# for target_alias and gcc doesn't manage it consistently. -target_configargs="--cache-file=./config.cache --build=${build_alias} --host=${target_alias} --target=${target_alias} ${target_configargs}" +# Pass the appropriate --host, --build, and --cache-file arguments. +target_configargs="--cache-file=./config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}" FLAGS_FOR_TARGET= case " $target_configdirs " in @@ -3350,6 +3404,89 @@ if test "x${use_gnu_ld}" = x && FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(HOST_SUBDIR)/ld' fi +if test "x${CC_FOR_TARGET+set}" = xset; then + : +elif test -d ${srcdir}/gcc; then + CC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/' +elif test "$host" = "$target"; then + CC_FOR_TARGET='$(CC)' +else + CC_FOR_TARGET=`echo gcc | sed "${program_transform_name}"` +fi +CC_FOR_TARGET=$CC_FOR_TARGET' $(FLAGS_FOR_TARGET)' + +if test "x${GCJ_FOR_TARGET+set}" = xset; then + : +elif test -d ${srcdir}/gcc; then + GCJ_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/' +elif test "$host" = "$target"; then + GCJ_FOR_TARGET='gcj' +else + GCJ_FOR_TARGET=`echo gcj | sed "${program_transform_name}"` +fi +GCJ_FOR_TARGET=$GCJ_FOR_TARGET' $(FLAGS_FOR_TARGET)' + +if test "x${GFORTRAN_FOR_TARGET+set}" = xset; then + : +elif test -d ${srcdir}/gcc; then + GFORTRAN_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/' +elif test "$host" = "$target"; then + GFORTRAN_FOR_TARGET='gfortran' +else + GFORTRAN_FOR_TARGET=`echo gfortran | sed "${program_transform_name}"` +fi +case $GFORTRAN_FOR_TARGET in +*' $(FLAGS_FOR_TARGET)') ;; +*) GFORTRAN_FOR_TARGET=$GFORTRAN_FOR_TARGET' $(FLAGS_FOR_TARGET)' ;; +esac + +# Don't use libstdc++-v3's flags to configure/build itself. +libstdcxx_flags='`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' +raw_libstdcxx_flags='-L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' + +if test "x${CXX_FOR_TARGET+set}" = xset; then + if test "x${RAW_CXX_FOR_TARGET+set}" != xset; then + RAW_CXX_FOR_TARGET=${CXX_FOR_TARGET} + fi +elif test -d ${srcdir}/gcc; then + # We add -shared-libgcc to CXX_FOR_TARGET whenever we use xgcc instead + # of g++ for linking C++ or Java, because g++ has -shared-libgcc by + # default whereas gcc does not. + # RAW_CXX_FOR_TARGET is for linking C++ or java; CXX_FOR_TARGET is for + # all other cases. + CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ '$libstdcxx_flags + RAW_CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ '$raw_libstdcxx_flags +elif test "$host" = "$target"; then + CXX_FOR_TARGET='$(CXX)' + RAW_CXX_FOR_TARGET=${CXX_FOR_TARGET} +else + CXX_FOR_TARGET=`echo c++ | sed "${program_transform_name}"` + RAW_CXX_FOR_TARGET=${CXX_FOR_TARGET} +fi +CXX_FOR_TARGET=$CXX_FOR_TARGET' $(FLAGS_FOR_TARGET)' +RAW_CXX_FOR_TARGET=$RAW_CXX_FOR_TARGET' $(FLAGS_FOR_TARGET)' + +qCXX_FOR_TARGET=`echo "$CXX_FOR_TARGET" | sed 's,[&%],\\\&,g'` +qRAW_CXX_FOR_TARGET=`echo "$RAW_CXX_FOR_TARGET" | sed 's,[&%],\\\&,g'` + +# We want to defer the evaluation of `cmd`s and shell variables in +# CXX_FOR_TARGET when recursing in the top-level Makefile, such as for +# bootstrap. We'll enclose CXX_FOR_TARGET_FOR_RECURSIVE_MAKE in single +# quotes, but we still have to duplicate `$'s so that shell variables +# can be expanded by the nested make as shell variables, not as make +# macros. +qqCXX_FOR_TARGET=`echo "$qCXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'` +qqRAW_CXX_FOR_TARGET=`echo "$qRAW_CXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'` + +# Wrap CC_FOR_TARGET and friends, for certain types of builds. +CC_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${CC_FOR_TARGET}" +GCJ_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${GCJ_FOR_TARGET}" +GFORTRAN_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${GFORTRAN_FOR_TARGET}" +CXX_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${qCXX_FOR_TARGET}" +RAW_CXX_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${qRAW_CXX_FOR_TARGET}" +CXX_FOR_TARGET_FOR_RECURSIVE_MAKE="\$(STAGE_CC_WRAPPER) ${qqCXX_FOR_TARGET}" +RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE="\$(STAGE_CC_WRAPPER) ${qqRAW_CXX_FOR_TARGET}" + # Makefile fragments. for frag in host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag; do @@ -3387,356 +3524,17 @@ done -# Generate default definitions for YACC, M4, LEX and other programs that run -# on the build machine. These are used if the Makefile can't locate these -# programs in objdir. -MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing - -for ac_prog in 'bison -y' byacc yacc -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 -if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YACC"; then - ac_cv_prog_YACC="$YACC" # 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_YACC="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YACC="$ac_cv_prog_YACC" -if test -n "$YACC"; then - echo "$ac_t""$YACC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$YACC" && break -done -test -n "$YACC" || YACC="$MISSING bison -y" - -case " $build_configdirs " in - *" bison "*) YACC='$$r/$(BUILD_SUBDIR)/bison/tests/bison -y' ;; - *" byacc "*) YACC='$$r/$(BUILD_SUBDIR)/byacc/byacc' ;; -esac - -for ac_prog in bison -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 -if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$BISON"; then - ac_cv_prog_BISON="$BISON" # 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_BISON="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -BISON="$ac_cv_prog_BISON" -if test -n "$BISON"; then - echo "$ac_t""$BISON" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$BISON" && break -done -test -n "$BISON" || BISON="$MISSING bison" - -case " $build_configdirs " in - *" bison "*) BISON='$$r/$(BUILD_SUBDIR)/bison/tests/bison' ;; -esac - -for ac_prog in gm4 gnum4 m4 -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 -if eval "test \"`echo '$''{'ac_cv_prog_M4'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$M4"; then - ac_cv_prog_M4="$M4" # 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_M4="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -M4="$ac_cv_prog_M4" -if test -n "$M4"; then - echo "$ac_t""$M4" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$M4" && break -done -test -n "$M4" || M4="$MISSING m4" - -case " $build_configdirs " in - *" m4 "*) M4='$$r/$(BUILD_SUBDIR)/m4/m4' ;; -esac - -for ac_prog in flex lex -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 -if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$LEX"; then - ac_cv_prog_LEX="$LEX" # 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_LEX="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -LEX="$ac_cv_prog_LEX" -if test -n "$LEX"; then - echo "$ac_t""$LEX" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$LEX" && break -done -test -n "$LEX" || LEX="$MISSING flex" - -case " $build_configdirs " in - *" flex "*) LEX='$$r/$(BUILD_SUBDIR)/flex/flex' ;; - *" lex "*) LEX='$$r/$(BUILD_SUBDIR)/lex/lex' ;; -esac - -for ac_prog in flex -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 -if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$FLEX"; then - ac_cv_prog_FLEX="$FLEX" # 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_FLEX="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -FLEX="$ac_cv_prog_FLEX" -if test -n "$FLEX"; then - echo "$ac_t""$FLEX" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$FLEX" && break -done -test -n "$FLEX" || FLEX="$MISSING flex" - -case " $build_configdirs " in - *" flex "*) FLEX='$$r/$(BUILD_SUBDIR)/flex/flex' ;; -esac - -for ac_prog in makeinfo -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 -if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$MAKEINFO"; then - ac_cv_prog_MAKEINFO="$MAKEINFO" # 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_MAKEINFO="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -MAKEINFO="$ac_cv_prog_MAKEINFO" -if test -n "$MAKEINFO"; then - echo "$ac_t""$MAKEINFO" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$MAKEINFO" && break -done -test -n "$MAKEINFO" || MAKEINFO="$MISSING makeinfo" - -case " $build_configdirs " in - *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; - *) - - # For an installed makeinfo, we require it to be from texinfo 4.2 or - # higher, else we use the "missing" dummy. - if ${MAKEINFO} --version \ - | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then - : - else - MAKEINFO="$MISSING makeinfo" - fi - ;; - -esac - -# FIXME: expect and dejagnu may become build tools? - -for ac_prog in expect -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 -if eval "test \"`echo '$''{'ac_cv_prog_EXPECT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$EXPECT"; then - ac_cv_prog_EXPECT="$EXPECT" # 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_EXPECT="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -EXPECT="$ac_cv_prog_EXPECT" -if test -n "$EXPECT"; then - echo "$ac_t""$EXPECT" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$EXPECT" && break -done -test -n "$EXPECT" || EXPECT="expect" - -case " $configdirs " in - *" expect "*) - test $host = $build && EXPECT='$$r/$(HOST_SUBDIR)/expect/expect' - ;; -esac - -for ac_prog in runtest -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 -if eval "test \"`echo '$''{'ac_cv_prog_RUNTEST'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$RUNTEST"; then - ac_cv_prog_RUNTEST="$RUNTEST" # 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_RUNTEST="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -RUNTEST="$ac_cv_prog_RUNTEST" -if test -n "$RUNTEST"; then - echo "$ac_t""$RUNTEST" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$RUNTEST" && break -done -test -n "$RUNTEST" || RUNTEST="runtest" - -case " $configdirs " in - *" dejagnu "*) - test $host = $build && RUNTEST='$$r/$(HOST_SUBDIR)/dejagnu/runtest' - ;; -esac - - # Host tools. ncn_tool_prefix= test -n "$host_alias" && ncn_tool_prefix=$host_alias- ncn_target_tool_prefix= test -n "$target_alias" && ncn_target_tool_prefix=$target_alias- - for ncn_progname in ar; do - if test -n "$ncn_tool_prefix"; then - # 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 + if test -n "$ncn_tool_prefix"; then + # Extract the first word of "${ncn_tool_prefix}ar", so it can be a program name with args. +set dummy ${ncn_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3740: checking for $ac_word" >&5 +echo "configure:3538: 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 @@ -3748,7 +3546,7 @@ else 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="${ncn_tool_prefix}${ncn_progname}" + ac_cv_prog_AR="${ncn_tool_prefix}ar" break fi done @@ -3762,56 +3560,53 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_AR" && test $build = $host ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 +fi +if test -z "$ac_cv_prog_AR" ; then + if test $build = $host ; then + ncn_cv_AR=$AR + # 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:3771: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then +echo "configure:3571: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. + if test -n "$ncn_cv_AR"; then + ac_cv_prog_ncn_cv_AR="$ncn_cv_AR" # 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="${ncn_progname}" + ac_cv_prog_ncn_cv_AR="ar" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_ncn_cv_AR" && ac_cv_prog_ncn_cv_AR="ar" fi fi -AR="$ac_cv_prog_AR" -if test -n "$AR"; then - echo "$ac_t""$AR" 1>&6 +ncn_cv_AR="$ac_cv_prog_ncn_cv_AR" +if test -n "$ncn_cv_AR"; then + echo "$ac_t""$ncn_cv_AR" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_AR" && break -done - -if test -z "$ac_cv_prog_AR" ; then - set dummy ar - if test $build = $host ; then - AR="$2" + AR=$ncn_cv_AR else - AR="${ncn_tool_prefix}$2" + AR="${ncn_tool_prefix}ar" fi +else + AR="$ac_cv_prog_AR" fi - for ncn_progname in as; do - if test -n "$ncn_tool_prefix"; then - # 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 + if test -n "$ncn_tool_prefix"; then + # Extract the first word of "${ncn_tool_prefix}as", so it can be a program name with args. +set dummy ${ncn_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3815: checking for $ac_word" >&5 +echo "configure:3610: 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 @@ -3823,7 +3618,7 @@ else 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="${ncn_tool_prefix}${ncn_progname}" + ac_cv_prog_AS="${ncn_tool_prefix}as" break fi done @@ -3837,56 +3632,53 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_AS" && test $build = $host ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 +fi +if test -z "$ac_cv_prog_AS" ; then + if test $build = $host ; then + ncn_cv_AS=$AS + # 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:3846: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then +echo "configure:3643: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. + if test -n "$ncn_cv_AS"; then + ac_cv_prog_ncn_cv_AS="$ncn_cv_AS" # 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="${ncn_progname}" + ac_cv_prog_ncn_cv_AS="as" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_ncn_cv_AS" && ac_cv_prog_ncn_cv_AS="as" fi fi -AS="$ac_cv_prog_AS" -if test -n "$AS"; then - echo "$ac_t""$AS" 1>&6 +ncn_cv_AS="$ac_cv_prog_ncn_cv_AS" +if test -n "$ncn_cv_AS"; then + echo "$ac_t""$ncn_cv_AS" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_AS" && break -done - -if test -z "$ac_cv_prog_AS" ; then - set dummy as - if test $build = $host ; then - AS="$2" + AS=$ncn_cv_AS else - AS="${ncn_tool_prefix}$2" + AS="${ncn_tool_prefix}as" fi +else + AS="$ac_cv_prog_AS" fi - for ncn_progname in dlltool; do - if test -n "$ncn_tool_prefix"; then - # 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 + if test -n "$ncn_tool_prefix"; then + # Extract the first word of "${ncn_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ncn_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3890: checking for $ac_word" >&5 +echo "configure:3682: 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 @@ -3898,7 +3690,7 @@ else 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="${ncn_tool_prefix}${ncn_progname}" + ac_cv_prog_DLLTOOL="${ncn_tool_prefix}dlltool" break fi done @@ -3912,87 +3704,53 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_DLLTOOL" && test $build = $host ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 +fi +if test -z "$ac_cv_prog_DLLTOOL" ; then + if test $build = $host ; then + ncn_cv_DLLTOOL=$DLLTOOL + # 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:3921: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then +echo "configure:3715: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. + if test -n "$ncn_cv_DLLTOOL"; then + ac_cv_prog_ncn_cv_DLLTOOL="$ncn_cv_DLLTOOL" # 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="${ncn_progname}" + ac_cv_prog_ncn_cv_DLLTOOL="dlltool" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_ncn_cv_DLLTOOL" && ac_cv_prog_ncn_cv_DLLTOOL="dlltool" fi fi -DLLTOOL="$ac_cv_prog_DLLTOOL" -if test -n "$DLLTOOL"; then - echo "$ac_t""$DLLTOOL" 1>&6 +ncn_cv_DLLTOOL="$ac_cv_prog_ncn_cv_DLLTOOL" +if test -n "$ncn_cv_DLLTOOL"; then + echo "$ac_t""$ncn_cv_DLLTOOL" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_DLLTOOL" && break -done - -if test -z "$ac_cv_prog_DLLTOOL" ; then - set dummy dlltool - if test $build = $host ; then - DLLTOOL="$2" + DLLTOOL=$ncn_cv_DLLTOOL else - DLLTOOL="${ncn_tool_prefix}$2" + DLLTOOL="${ncn_tool_prefix}dlltool" fi -fi - - for ncn_progname in ld; do - if test -n "$ncn_tool_prefix"; then - # 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 -if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$LD"; then - ac_cv_prog_LD="$LD" # 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_LD="${ncn_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -LD="$ac_cv_prog_LD" -if test -n "$LD"; then - echo "$ac_t""$LD" 1>&6 else - echo "$ac_t""no" 1>&6 + DLLTOOL="$ac_cv_prog_DLLTOOL" fi - fi - if test -z "$ac_cv_prog_LD" && test $build = $host ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 + if test -n "$ncn_tool_prefix"; then + # Extract the first word of "${ncn_tool_prefix}ld", so it can be a program name with args. +set dummy ${ncn_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3996: checking for $ac_word" >&5 +echo "configure:3754: 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 @@ -4004,7 +3762,7 @@ else for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_LD="${ncn_progname}" + ac_cv_prog_LD="${ncn_tool_prefix}ld" break fi done @@ -4017,101 +3775,54 @@ if test -n "$LD"; then else echo "$ac_t""no" 1>&6 fi - - fi - test -n "$ac_cv_prog_LD" && break -done +fi if test -z "$ac_cv_prog_LD" ; then - set dummy ld if test $build = $host ; then - LD="$2" - else - LD="${ncn_tool_prefix}$2" - fi -fi - - for ncn_progname in lipo; do - if test -n "$ncn_tool_prefix"; then - # 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 -if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$LIPO"; then - ac_cv_prog_LIPO="$LIPO" # 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_LIPO="${ncn_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -LIPO="$ac_cv_prog_LIPO" -if test -n "$LIPO"; then - echo "$ac_t""$LIPO" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - fi - if test -z "$ac_cv_prog_LIPO" && test $build = $host ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 + ncn_cv_LD=$LD + # 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:4071: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then +echo "configure:3787: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$LIPO"; then - ac_cv_prog_LIPO="$LIPO" # Let the user override the test. + if test -n "$ncn_cv_LD"; then + ac_cv_prog_ncn_cv_LD="$ncn_cv_LD" # 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_LIPO="${ncn_progname}" + ac_cv_prog_ncn_cv_LD="ld" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_ncn_cv_LD" && ac_cv_prog_ncn_cv_LD="ld" fi fi -LIPO="$ac_cv_prog_LIPO" -if test -n "$LIPO"; then - echo "$ac_t""$LIPO" 1>&6 +ncn_cv_LD="$ac_cv_prog_ncn_cv_LD" +if test -n "$ncn_cv_LD"; then + echo "$ac_t""$ncn_cv_LD" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_LIPO" && break -done - -if test -z "$ac_cv_prog_LIPO" ; then - set dummy lipo - if test $build = $host ; then - LIPO="$2" + LD=$ncn_cv_LD else - LIPO="${ncn_tool_prefix}$2" + LD="${ncn_tool_prefix}ld" fi +else + LD="$ac_cv_prog_LD" fi - for ncn_progname in nm; do - if test -n "$ncn_tool_prefix"; then - # 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 + if test -n "$ncn_tool_prefix"; then + # Extract the first word of "${ncn_tool_prefix}nm", so it can be a program name with args. +set dummy ${ncn_tool_prefix}nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4115: checking for $ac_word" >&5 +echo "configure:3826: 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 @@ -4123,7 +3834,7 @@ else for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_NM="${ncn_tool_prefix}${ncn_progname}" + ac_cv_prog_NM="${ncn_tool_prefix}nm" break fi done @@ -4137,87 +3848,53 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_NM" && test $build = $host ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 +fi +if test -z "$ac_cv_prog_NM" ; then + if test $build = $host ; then + ncn_cv_NM=$NM + # 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:4146: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then +echo "configure:3859: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$NM"; then - ac_cv_prog_NM="$NM" # Let the user override the test. + if test -n "$ncn_cv_NM"; then + ac_cv_prog_ncn_cv_NM="$ncn_cv_NM" # 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_NM="${ncn_progname}" + ac_cv_prog_ncn_cv_NM="nm" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_ncn_cv_NM" && ac_cv_prog_ncn_cv_NM="nm" fi fi -NM="$ac_cv_prog_NM" -if test -n "$NM"; then - echo "$ac_t""$NM" 1>&6 +ncn_cv_NM="$ac_cv_prog_ncn_cv_NM" +if test -n "$ncn_cv_NM"; then + echo "$ac_t""$ncn_cv_NM" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_NM" && break -done - -if test -z "$ac_cv_prog_NM" ; then - set dummy nm - if test $build = $host ; then - NM="$2" + NM=$ncn_cv_NM else - NM="${ncn_tool_prefix}$2" + NM="${ncn_tool_prefix}nm" fi -fi - - for ncn_progname in ranlib; do - if test -n "$ncn_tool_prefix"; then - # 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 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="${ncn_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 + NM="$ac_cv_prog_NM" fi - fi - if test -z "$ac_cv_prog_RANLIB" && test $build = $host ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 + if test -n "$ncn_tool_prefix"; then + # Extract the first word of "${ncn_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ncn_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4221: checking for $ac_word" >&5 +echo "configure:3898: 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 @@ -4229,7 +3906,7 @@ else for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="${ncn_progname}" + ac_cv_prog_RANLIB="${ncn_tool_prefix}ranlib" break fi done @@ -4242,91 +3919,54 @@ if test -n "$RANLIB"; then else echo "$ac_t""no" 1>&6 fi - - fi - test -n "$ac_cv_prog_RANLIB" && break -done - -if test -z "$ac_cv_prog_RANLIB" ; then - RANLIB=":" -fi - for ncn_progname in strip; do - if test -n "$ncn_tool_prefix"; then - # 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 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # 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_STRIP="${ncn_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -STRIP="$ac_cv_prog_STRIP" -if test -n "$STRIP"; then - echo "$ac_t""$STRIP" 1>&6 -else - echo "$ac_t""no" 1>&6 fi - - fi - if test -z "$ac_cv_prog_STRIP" && test $build = $host ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 +if test -z "$ac_cv_prog_RANLIB" ; then + if test $build = $host ; then + ncn_cv_RANLIB=$RANLIB + # 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:4291: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then +echo "configure:3931: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + if test -n "$ncn_cv_RANLIB"; then + ac_cv_prog_ncn_cv_RANLIB="$ncn_cv_RANLIB" # 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_STRIP="${ncn_progname}" + ac_cv_prog_ncn_cv_RANLIB="ranlib" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_ncn_cv_RANLIB" && ac_cv_prog_ncn_cv_RANLIB=":" fi fi -STRIP="$ac_cv_prog_STRIP" -if test -n "$STRIP"; then - echo "$ac_t""$STRIP" 1>&6 +ncn_cv_RANLIB="$ac_cv_prog_ncn_cv_RANLIB" +if test -n "$ncn_cv_RANLIB"; then + echo "$ac_t""$ncn_cv_RANLIB" 1>&6 else echo "$ac_t""no" 1>&6 fi + RANLIB=$ncn_cv_RANLIB + else + RANLIB=":" fi - test -n "$ac_cv_prog_STRIP" && break -done - -if test -z "$ac_cv_prog_STRIP" ; then - STRIP=":" +else + RANLIB="$ac_cv_prog_RANLIB" fi - for ncn_progname in windres; do - if test -n "$ncn_tool_prefix"; then - # 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 + if test -n "$ncn_tool_prefix"; then + # Extract the first word of "${ncn_tool_prefix}windres", so it can be a program name with args. +set dummy ${ncn_tool_prefix}windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4330: checking for $ac_word" >&5 +echo "configure:3970: 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 @@ -4338,7 +3978,7 @@ else for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_WINDRES="${ncn_tool_prefix}${ncn_progname}" + ac_cv_prog_WINDRES="${ncn_tool_prefix}windres" break fi done @@ -4352,56 +3992,53 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_WINDRES" && test $build = $host ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 +fi +if test -z "$ac_cv_prog_WINDRES" ; then + if test $build = $host ; then + ncn_cv_WINDRES=$WINDRES + # 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:4361: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then +echo "configure:4003: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$WINDRES"; then - ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. + if test -n "$ncn_cv_WINDRES"; then + ac_cv_prog_ncn_cv_WINDRES="$ncn_cv_WINDRES" # 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_WINDRES="${ncn_progname}" + ac_cv_prog_ncn_cv_WINDRES="windres" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_ncn_cv_WINDRES" && ac_cv_prog_ncn_cv_WINDRES="windres" fi fi -WINDRES="$ac_cv_prog_WINDRES" -if test -n "$WINDRES"; then - echo "$ac_t""$WINDRES" 1>&6 +ncn_cv_WINDRES="$ac_cv_prog_ncn_cv_WINDRES" +if test -n "$ncn_cv_WINDRES"; then + echo "$ac_t""$ncn_cv_WINDRES" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_WINDRES" && break -done - -if test -z "$ac_cv_prog_WINDRES" ; then - set dummy windres - if test $build = $host ; then - WINDRES="$2" + WINDRES=$ncn_cv_WINDRES else - WINDRES="${ncn_tool_prefix}$2" + WINDRES="${ncn_tool_prefix}windres" fi +else + WINDRES="$ac_cv_prog_WINDRES" fi - for ncn_progname in objcopy; do - if test -n "$ncn_tool_prefix"; then - # 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 + if test -n "$ncn_tool_prefix"; then + # Extract the first word of "${ncn_tool_prefix}objcopy", so it can be a program name with args. +set dummy ${ncn_tool_prefix}objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4405: checking for $ac_word" >&5 +echo "configure:4042: 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 @@ -4413,7 +4050,7 @@ else for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_OBJCOPY="${ncn_tool_prefix}${ncn_progname}" + ac_cv_prog_OBJCOPY="${ncn_tool_prefix}objcopy" break fi done @@ -4427,56 +4064,53 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_OBJCOPY" && test $build = $host ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 +fi +if test -z "$ac_cv_prog_OBJCOPY" ; then + if test $build = $host ; then + ncn_cv_OBJCOPY=$OBJCOPY + # Extract the first word of "objcopy", so it can be a program name with args. +set dummy objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4436: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then +echo "configure:4075: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$OBJCOPY"; then - ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test. + if test -n "$ncn_cv_OBJCOPY"; then + ac_cv_prog_ncn_cv_OBJCOPY="$ncn_cv_OBJCOPY" # 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_OBJCOPY="${ncn_progname}" + ac_cv_prog_ncn_cv_OBJCOPY="objcopy" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_ncn_cv_OBJCOPY" && ac_cv_prog_ncn_cv_OBJCOPY="objcopy" fi fi -OBJCOPY="$ac_cv_prog_OBJCOPY" -if test -n "$OBJCOPY"; then - echo "$ac_t""$OBJCOPY" 1>&6 +ncn_cv_OBJCOPY="$ac_cv_prog_ncn_cv_OBJCOPY" +if test -n "$ncn_cv_OBJCOPY"; then + echo "$ac_t""$ncn_cv_OBJCOPY" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_OBJCOPY" && break -done - -if test -z "$ac_cv_prog_OBJCOPY" ; then - set dummy objcopy - if test $build = $host ; then - OBJCOPY="$2" + OBJCOPY=$ncn_cv_OBJCOPY else - OBJCOPY="${ncn_tool_prefix}$2" + OBJCOPY="${ncn_tool_prefix}objcopy" fi +else + OBJCOPY="$ac_cv_prog_OBJCOPY" fi - for ncn_progname in objdump; do - if test -n "$ncn_tool_prefix"; then - # 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 + if test -n "$ncn_tool_prefix"; then + # Extract the first word of "${ncn_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ncn_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4480: checking for $ac_word" >&5 +echo "configure:4114: 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 @@ -4488,7 +4122,7 @@ else for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_OBJDUMP="${ncn_tool_prefix}${ncn_progname}" + ac_cv_prog_OBJDUMP="${ncn_tool_prefix}objdump" break fi done @@ -4502,48 +4136,46 @@ else echo "$ac_t""no" 1>&6 fi - fi - if test -z "$ac_cv_prog_OBJDUMP" && test $build = $host ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 +fi +if test -z "$ac_cv_prog_OBJDUMP" ; then + if test $build = $host ; then + ncn_cv_OBJDUMP=$OBJDUMP + # 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:4511: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then +echo "configure:4147: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. + if test -n "$ncn_cv_OBJDUMP"; then + ac_cv_prog_ncn_cv_OBJDUMP="$ncn_cv_OBJDUMP" # 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_OBJDUMP="${ncn_progname}" + ac_cv_prog_ncn_cv_OBJDUMP="objdump" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_ncn_cv_OBJDUMP" && ac_cv_prog_ncn_cv_OBJDUMP="objdump" fi fi -OBJDUMP="$ac_cv_prog_OBJDUMP" -if test -n "$OBJDUMP"; then - echo "$ac_t""$OBJDUMP" 1>&6 +ncn_cv_OBJDUMP="$ac_cv_prog_ncn_cv_OBJDUMP" +if test -n "$ncn_cv_OBJDUMP"; then + echo "$ac_t""$ncn_cv_OBJDUMP" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_OBJDUMP" && break -done - -if test -z "$ac_cv_prog_OBJDUMP" ; then - set dummy objdump - if test $build = $host ; then - OBJDUMP="$2" + OBJDUMP=$ncn_cv_OBJDUMP else - OBJDUMP="${ncn_tool_prefix}$2" + OBJDUMP="${ncn_tool_prefix}objdump" fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" fi @@ -4553,2595 +4185,550 @@ 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. -set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}ar", so it can be a program name with args. +set dummy ${ncn_target_tool_prefix}ar; 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:4193: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_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 "$CONFIGURED_AR_FOR_TARGET"; then + ac_cv_prog_CONFIGURED_AR_FOR_TARGET="$CONFIGURED_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_CONFIGURED_AR_FOR_TARGET="${ncn_target_tool_prefix}ar" 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 +CONFIGURED_AR_FOR_TARGET="$ac_cv_prog_CONFIGURED_AR_FOR_TARGET" +if test -n "$CONFIGURED_AR_FOR_TARGET"; then + echo "$ac_t""$CONFIGURED_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. -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 $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. -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}" - 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 -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 +if test -z "$ac_cv_prog_CONFIGURED_AR_FOR_TARGET" ; then if test $build = $target ; then - CC_FOR_TARGET="$2" - else - CC_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. -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 $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. -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}" - 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 -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. -set dummy ${ncn_progname}; ac_word=$2 + ncn_cv_CONFIGURED_AR_FOR_TARGET=$CONFIGURED_AR_FOR_TARGET + # 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:4714: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4226: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AR_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 "$ncn_cv_CONFIGURED_AR_FOR_TARGET"; then + ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET="$ncn_cv_CONFIGURED_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_CXX_FOR_TARGET="${ncn_progname}" + ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET="ar" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET="ar" 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 +ncn_cv_CONFIGURED_AR_FOR_TARGET="$ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET" +if test -n "$ncn_cv_CONFIGURED_AR_FOR_TARGET"; then + echo "$ac_t""$ncn_cv_CONFIGURED_AR_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 - if test $build = $target ; then - CXX_FOR_TARGET="$2" + CONFIGURED_AR_FOR_TARGET=$ncn_cv_CONFIGURED_AR_FOR_TARGET else - CXX_FOR_TARGET="${ncn_target_tool_prefix}$2" + CONFIGURED_AR_FOR_TARGET="${ncn_target_tool_prefix}ar" 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. -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 $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. -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}" - 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 -else - echo "$ac_t""no" 1>&6 + CONFIGURED_AR_FOR_TARGET="$ac_cv_prog_CONFIGURED_AR_FOR_TARGET" 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. -set dummy ${ncn_progname}; ac_word=$2 + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}as", so it can be a program name with args. +set dummy ${ncn_target_tool_prefix}as; 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:4265: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AS_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 "$CONFIGURED_AS_FOR_TARGET"; then + ac_cv_prog_CONFIGURED_AS_FOR_TARGET="$CONFIGURED_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_GCC_FOR_TARGET="${ncn_progname}" + ac_cv_prog_CONFIGURED_AS_FOR_TARGET="${ncn_target_tool_prefix}as" 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 +CONFIGURED_AS_FOR_TARGET="$ac_cv_prog_CONFIGURED_AS_FOR_TARGET" +if test -n "$CONFIGURED_AS_FOR_TARGET"; then + echo "$ac_t""$CONFIGURED_AS_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 - - 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 -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. -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 $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. -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}" - 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 -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. -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 $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. -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}" - 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 -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 +if test -z "$ac_cv_prog_CONFIGURED_AS_FOR_TARGET" ; then if test $build = $target ; then - GCJ_FOR_TARGET="$2" - else - GCJ_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. -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 $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. -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}" - 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 -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. -set dummy ${ncn_progname}; ac_word=$2 + ncn_cv_CONFIGURED_AS_FOR_TARGET=$CONFIGURED_AS_FOR_TARGET + # 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:4982: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4298: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AS_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 "$ncn_cv_CONFIGURED_AS_FOR_TARGET"; then + ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET="$ncn_cv_CONFIGURED_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_GFORTRAN_FOR_TARGET="${ncn_progname}" + ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET="as" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET="as" 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 +ncn_cv_CONFIGURED_AS_FOR_TARGET="$ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET" +if test -n "$ncn_cv_CONFIGURED_AS_FOR_TARGET"; then + echo "$ac_t""$ncn_cv_CONFIGURED_AS_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 - - - -# 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=';' + CONFIGURED_AS_FOR_TARGET=$ncn_cv_CONFIGURED_AS_FOR_TARGET 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 + CONFIGURED_AS_FOR_TARGET="${ncn_target_tool_prefix}as" 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 + CONFIGURED_AS_FOR_TARGET="$ac_cv_prog_CONFIGURED_AS_FOR_TARGET" 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. -set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ncn_target_tool_prefix}dlltool; 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:4337: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_DLLTOOL_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 "$CONFIGURED_DLLTOOL_FOR_TARGET"; then + ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET="$CONFIGURED_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_AR_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}dlltool" 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 +CONFIGURED_DLLTOOL_FOR_TARGET="$ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET" +if test -n "$CONFIGURED_DLLTOOL_FOR_TARGET"; then + echo "$ac_t""$CONFIGURED_DLLTOOL_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. -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 $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. -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}" - 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 -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 -z "$ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET" ; then 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 - -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 -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. -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 $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. -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}" - 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 -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. -set dummy ${ncn_progname}; ac_word=$2 + ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET=$CONFIGURED_DLLTOOL_FOR_TARGET + # 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:5345: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4370: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_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 "$ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET"; then + ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET="$ncn_cv_CONFIGURED_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_AS_FOR_TARGET="${ncn_progname}" + ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET="dlltool" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET="dlltool" 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 +ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET="$ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET" +if test -n "$ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET"; then + echo "$ac_t""$ncn_cv_CONFIGURED_DLLTOOL_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 - if test $build = $target ; then - AS_FOR_TARGET="$2" + CONFIGURED_DLLTOOL_FOR_TARGET=$ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET else - AS_FOR_TARGET="${ncn_target_tool_prefix}$2" + CONFIGURED_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}dlltool" 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 + CONFIGURED_DLLTOOL_FOR_TARGET="$ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET" 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. -set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}ld", so it can be a program name with args. +set dummy ${ncn_target_tool_prefix}ld; 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:4409: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LD_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 "$CONFIGURED_LD_FOR_TARGET"; then + ac_cv_prog_CONFIGURED_LD_FOR_TARGET="$CONFIGURED_LD_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_CONFIGURED_LD_FOR_TARGET="${ncn_target_tool_prefix}ld" 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 +CONFIGURED_LD_FOR_TARGET="$ac_cv_prog_CONFIGURED_LD_FOR_TARGET" +if test -n "$CONFIGURED_LD_FOR_TARGET"; then + echo "$ac_t""$CONFIGURED_LD_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. -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 $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. -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}" - 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 -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 +if test -z "$ac_cv_prog_CONFIGURED_LD_FOR_TARGET" ; then if test $build = $target ; then - DLLTOOL_FOR_TARGET="$2" - else - DLLTOOL_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. + ncn_cv_CONFIGURED_LD_FOR_TARGET=$CONFIGURED_LD_FOR_TARGET + # 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 "configure:4442: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_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. -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 -if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$LD_FOR_TARGET"; then - ac_cv_prog_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test. + if test -n "$ncn_cv_CONFIGURED_LD_FOR_TARGET"; then + ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET="$ncn_cv_CONFIGURED_LD_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_LD_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET="ld" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET="ld" fi fi -LD_FOR_TARGET="$ac_cv_prog_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_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 -if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$LD_FOR_TARGET"; then - ac_cv_prog_LD_FOR_TARGET="$LD_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_LD_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -LD_FOR_TARGET="$ac_cv_prog_LD_FOR_TARGET" -if test -n "$LD_FOR_TARGET"; then - echo "$ac_t""$LD_FOR_TARGET" 1>&6 +ncn_cv_CONFIGURED_LD_FOR_TARGET="$ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET" +if test -n "$ncn_cv_CONFIGURED_LD_FOR_TARGET"; then + echo "$ac_t""$ncn_cv_CONFIGURED_LD_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_LD_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then - set dummy ld - if test $build = $target ; then - LD_FOR_TARGET="$2" + CONFIGURED_LD_FOR_TARGET=$ncn_cv_CONFIGURED_LD_FOR_TARGET else - LD_FOR_TARGET="${ncn_target_tool_prefix}$2" + CONFIGURED_LD_FOR_TARGET="${ncn_target_tool_prefix}ld" fi -fi - else - LD_FOR_TARGET=$ac_cv_path_LD_FOR_TARGET + CONFIGURED_LD_FOR_TARGET="$ac_cv_prog_CONFIGURED_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 + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}nm", so it can be a program name with args. +set dummy ${ncn_target_tool_prefix}nm; 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 "configure:4481: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_NM_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. -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 -if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$LIPO_FOR_TARGET"; then - ac_cv_prog_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test. + if test -n "$CONFIGURED_NM_FOR_TARGET"; then + ac_cv_prog_CONFIGURED_NM_FOR_TARGET="$CONFIGURED_NM_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_LIPO_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_CONFIGURED_NM_FOR_TARGET="${ncn_target_tool_prefix}nm" break fi done IFS="$ac_save_ifs" fi fi -LIPO_FOR_TARGET="$ac_cv_prog_LIPO_FOR_TARGET" -if test -n "$LIPO_FOR_TARGET"; then - echo "$ac_t""$LIPO_FOR_TARGET" 1>&6 +CONFIGURED_NM_FOR_TARGET="$ac_cv_prog_CONFIGURED_NM_FOR_TARGET" +if test -n "$CONFIGURED_NM_FOR_TARGET"; then + echo "$ac_t""$CONFIGURED_NM_FOR_TARGET" 1>&6 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. -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 -if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$LIPO_FOR_TARGET"; then - ac_cv_prog_LIPO_FOR_TARGET="$LIPO_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_LIPO_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -LIPO_FOR_TARGET="$ac_cv_prog_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 - test -n "$ac_cv_prog_LIPO_FOR_TARGET" && break - done fi - -if test -z "$ac_cv_prog_LIPO_FOR_TARGET" ; then - set dummy lipo +if test -z "$ac_cv_prog_CONFIGURED_NM_FOR_TARGET" ; then if test $build = $target ; then - LIPO_FOR_TARGET="$2" - else - LIPO_FOR_TARGET="${ncn_target_tool_prefix}$2" - 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. + ncn_cv_CONFIGURED_NM_FOR_TARGET=$CONFIGURED_NM_FOR_TARGET + # 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 "configure:4514: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_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. -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 -if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$NM_FOR_TARGET"; then - ac_cv_prog_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test. + if test -n "$ncn_cv_CONFIGURED_NM_FOR_TARGET"; then + ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET="$ncn_cv_CONFIGURED_NM_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_NM_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET="nm" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET="nm" fi fi -NM_FOR_TARGET="$ac_cv_prog_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_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 -if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$NM_FOR_TARGET"; then - ac_cv_prog_NM_FOR_TARGET="$NM_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_NM_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -NM_FOR_TARGET="$ac_cv_prog_NM_FOR_TARGET" -if test -n "$NM_FOR_TARGET"; then - echo "$ac_t""$NM_FOR_TARGET" 1>&6 +ncn_cv_CONFIGURED_NM_FOR_TARGET="$ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET" +if test -n "$ncn_cv_CONFIGURED_NM_FOR_TARGET"; then + echo "$ac_t""$ncn_cv_CONFIGURED_NM_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_NM_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then - set dummy nm - if test $build = $target ; then - NM_FOR_TARGET="$2" + CONFIGURED_NM_FOR_TARGET=$ncn_cv_CONFIGURED_NM_FOR_TARGET else - NM_FOR_TARGET="${ncn_target_tool_prefix}$2" - 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 + CONFIGURED_NM_FOR_TARGET="${ncn_target_tool_prefix}nm" 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 + CONFIGURED_NM_FOR_TARGET="$ac_cv_prog_CONFIGURED_NM_FOR_TARGET" 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. -set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ncn_target_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6079: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4553: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$OBJDUMP_FOR_TARGET"; then - ac_cv_prog_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test. + if test -n "$CONFIGURED_RANLIB_FOR_TARGET"; then + ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET="$CONFIGURED_RANLIB_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_OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET="${ncn_target_tool_prefix}ranlib" break fi done IFS="$ac_save_ifs" fi fi -OBJDUMP_FOR_TARGET="$ac_cv_prog_OBJDUMP_FOR_TARGET" -if test -n "$OBJDUMP_FOR_TARGET"; then - echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6 +CONFIGURED_RANLIB_FOR_TARGET="$ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET" +if test -n "$CONFIGURED_RANLIB_FOR_TARGET"; then + echo "$ac_t""$CONFIGURED_RANLIB_FOR_TARGET" 1>&6 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. -set dummy ${ncn_progname}; ac_word=$2 +fi +if test -z "$ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET" ; then + if test $build = $target ; then + ncn_cv_CONFIGURED_RANLIB_FOR_TARGET=$CONFIGURED_RANLIB_FOR_TARGET + # 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:6110: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4586: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$OBJDUMP_FOR_TARGET"; then - ac_cv_prog_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test. + if test -n "$ncn_cv_CONFIGURED_RANLIB_FOR_TARGET"; then + ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET="$ncn_cv_CONFIGURED_RANLIB_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_OBJDUMP_FOR_TARGET="${ncn_progname}" + ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET="ranlib" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET=":" fi fi -OBJDUMP_FOR_TARGET="$ac_cv_prog_OBJDUMP_FOR_TARGET" -if test -n "$OBJDUMP_FOR_TARGET"; then - echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6 +ncn_cv_CONFIGURED_RANLIB_FOR_TARGET="$ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET" +if test -n "$ncn_cv_CONFIGURED_RANLIB_FOR_TARGET"; then + echo "$ac_t""$ncn_cv_CONFIGURED_RANLIB_FOR_TARGET" 1>&6 else echo "$ac_t""no" 1>&6 fi - fi - test -n "$ac_cv_prog_OBJDUMP_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" ; then - set dummy objdump - if test $build = $target ; then - OBJDUMP_FOR_TARGET="$2" + CONFIGURED_RANLIB_FOR_TARGET=$ncn_cv_CONFIGURED_RANLIB_FOR_TARGET else - OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}$2" + CONFIGURED_RANLIB_FOR_TARGET=":" fi -fi - else - OBJDUMP_FOR_TARGET=$ac_cv_path_OBJDUMP_FOR_TARGET + CONFIGURED_RANLIB_FOR_TARGET="$ac_cv_prog_CONFIGURED_RANLIB_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 + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}windres", so it can be a program name with args. +set dummy ${ncn_target_tool_prefix}windres; 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 "configure:4625: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_WINDRES_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. -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 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$RANLIB_FOR_TARGET"; then - ac_cv_prog_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test. + if test -n "$CONFIGURED_WINDRES_FOR_TARGET"; then + ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET="$CONFIGURED_WINDRES_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_RANLIB_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET="${ncn_target_tool_prefix}windres" break fi done IFS="$ac_save_ifs" fi fi -RANLIB_FOR_TARGET="$ac_cv_prog_RANLIB_FOR_TARGET" -if test -n "$RANLIB_FOR_TARGET"; then - echo "$ac_t""$RANLIB_FOR_TARGET" 1>&6 +CONFIGURED_WINDRES_FOR_TARGET="$ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET" +if test -n "$CONFIGURED_WINDRES_FOR_TARGET"; then + echo "$ac_t""$CONFIGURED_WINDRES_FOR_TARGET" 1>&6 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. -set dummy ${ncn_progname}; ac_word=$2 +fi +if test -z "$ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET" ; then + if test $build = $target ; then + ncn_cv_CONFIGURED_WINDRES_FOR_TARGET=$CONFIGURED_WINDRES_FOR_TARGET + # 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:6263: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then +echo "configure:4658: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$RANLIB_FOR_TARGET"; then - ac_cv_prog_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test. + if test -n "$ncn_cv_CONFIGURED_WINDRES_FOR_TARGET"; then + ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET="$ncn_cv_CONFIGURED_WINDRES_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_RANLIB_FOR_TARGET="${ncn_progname}" + ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET="windres" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET="windres" fi fi -RANLIB_FOR_TARGET="$ac_cv_prog_RANLIB_FOR_TARGET" -if test -n "$RANLIB_FOR_TARGET"; then - echo "$ac_t""$RANLIB_FOR_TARGET" 1>&6 +ncn_cv_CONFIGURED_WINDRES_FOR_TARGET="$ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET" +if test -n "$ncn_cv_CONFIGURED_WINDRES_FOR_TARGET"; then + echo "$ac_t""$ncn_cv_CONFIGURED_WINDRES_FOR_TARGET" 1>&6 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" + CONFIGURED_WINDRES_FOR_TARGET=$ncn_cv_CONFIGURED_WINDRES_FOR_TARGET else - RANLIB_FOR_TARGET="${ncn_target_tool_prefix}$2" + CONFIGURED_WINDRES_FOR_TARGET="${ncn_target_tool_prefix}windres" fi -fi - else - RANLIB_FOR_TARGET=$ac_cv_path_RANLIB_FOR_TARGET + CONFIGURED_WINDRES_FOR_TARGET="$ac_cv_prog_CONFIGURED_WINDRES_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 -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 -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. -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 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$STRIP_FOR_TARGET"; then - ac_cv_prog_STRIP_FOR_TARGET="$STRIP_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_STRIP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -STRIP_FOR_TARGET="$ac_cv_prog_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 - - 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 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$STRIP_FOR_TARGET"; then - ac_cv_prog_STRIP_FOR_TARGET="$STRIP_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_STRIP_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -STRIP_FOR_TARGET="$ac_cv_prog_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 - - fi - test -n "$ac_cv_prog_STRIP_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_STRIP_FOR_TARGET" ; then - set dummy strip - if test $build = $target ; then - STRIP_FOR_TARGET="$2" - else - STRIP_FOR_TARGET="${ncn_target_tool_prefix}$2" - 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. -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 -if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$WINDRES_FOR_TARGET"; then - ac_cv_prog_WINDRES_FOR_TARGET="$WINDRES_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_WINDRES_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -WINDRES_FOR_TARGET="$ac_cv_prog_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_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 -if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$WINDRES_FOR_TARGET"; then - ac_cv_prog_WINDRES_FOR_TARGET="$WINDRES_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_WINDRES_FOR_TARGET="${ncn_progname}" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -WINDRES_FOR_TARGET="$ac_cv_prog_WINDRES_FOR_TARGET" -if test -n "$WINDRES_FOR_TARGET"; then - echo "$ac_t""$WINDRES_FOR_TARGET" 1>&6 +# Fix up target tools. +if test "x${build}" = "x${host}" ; then + # In this case, the newly built tools can and should be used, + # so we override the results of the autoconf tests. + # This should really only happen when the tools are actually being built, + # but that's a further refinement. The new build scheme, where + # tools are built into a structure paralleling where they're installed, + # should also eliminate all of this cleanly. + AR_FOR_TARGET="\$(USUAL_AR_FOR_TARGET)" + AS_FOR_TARGET="\$(USUAL_AS_FOR_TARGET)" + DLLTOOL_FOR_TARGET="\$(USUAL_DLLTOOL_FOR_TARGET)" + LD_FOR_TARGET="\$(USUAL_LD_FOR_TARGET)" + NM_FOR_TARGET="\$(USUAL_NM_FOR_TARGET)" + RANLIB_FOR_TARGET="\$(USUAL_RANLIB_FOR_TARGET)" + WINDRES_FOR_TARGET="\$(USUAL_WINDRES_FOR_TARGET)" else - echo "$ac_t""no" 1>&6 -fi - - fi - test -n "$ac_cv_prog_WINDRES_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then - set dummy windres - if test $build = $target ; then - WINDRES_FOR_TARGET="$2" - else - WINDRES_FOR_TARGET="${ncn_target_tool_prefix}$2" - fi + # Just use the ones we found. + AR_FOR_TARGET="\$(CONFIGURED_AR_FOR_TARGET)" + AS_FOR_TARGET="\$(CONFIGURED_AS_FOR_TARGET)" + DLLTOOL_FOR_TARGET="\$(CONFIGURED_DLLTOOL_FOR_TARGET)" + LD_FOR_TARGET="\$(CONFIGURED_LD_FOR_TARGET)" + NM_FOR_TARGET="\$(CONFIGURED_NM_FOR_TARGET)" + RANLIB_FOR_TARGET="\$(CONFIGURED_RANLIB_FOR_TARGET)" + WINDRES_FOR_TARGET="\$(CONFIGURED_WINDRES_FOR_TARGET)" 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 -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 -else - ok=yes - case " ${configdirs} " in - *" binutils "*) ;; - *) ok=no ;; - esac - - if test $ok = yes; then - # 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)' - echo "$ac_t""host tool" 1>&6 - else - # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 - 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 -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 -else - ok=yes - case " ${configdirs} " in - *" gas "*) ;; - *) ok=no ;; - esac - - if test $ok = yes; then - # 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)' - echo "$ac_t""host tool" 1>&6 - else - # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 - 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 -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 -else - ok=yes - case " ${configdirs} " in - *" gcc "*) ;; - *) ok=no ;; - esac - - if test $ok = yes; then - # 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)' - echo "$ac_t""host tool" 1>&6 - else - # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 - 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 -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 -else - ok=yes - case " ${configdirs} " in - *" gcc "*) ;; - *) ok=no ;; - esac - case ,${enable_languages}, in - *,c++,*) ;; - *) ok=no ;; - esac - if test $ok = yes; then - # 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)' - echo "$ac_t""host tool" 1>&6 - else - # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 - 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 -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 -else - ok=yes - case " ${configdirs} " in - *" gcc "*) ;; - *) ok=no ;; - esac - case ,${enable_languages}, in - *,c++,*) ;; - *) ok=no ;; - esac - if test $ok = yes; then - # 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)' - echo "$ac_t""host tool" 1>&6 - else - # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 - 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 -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 -else - ok=yes - case " ${configdirs} " in - *" binutils "*) ;; - *) ok=no ;; - esac - - if test $ok = yes; then - # 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)' - echo "$ac_t""host tool" 1>&6 - else - # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 - 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 -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 -else - ok=yes - case " ${configdirs} " in - *" gcc "*) ;; - *) ok=no ;; - esac - - if test $ok = yes; then - # 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='$()' - echo "$ac_t""host tool" 1>&6 - else - # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 - 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 -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 -else - ok=yes - case " ${configdirs} " in - *" gcc "*) ;; - *) ok=no ;; - esac - case ,${enable_languages}, in - *,java,*) ;; - *) ok=no ;; - esac - if test $ok = yes; then - # 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)' - echo "$ac_t""host tool" 1>&6 - else - # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 - 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 -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 -else - ok=yes - case " ${configdirs} " in - *" gcc "*) ;; - *) ok=no ;; - esac - case ,${enable_languages}, in - *,fortran,*) ;; - *) ok=no ;; - esac - if test $ok = yes; then - # 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)' - echo "$ac_t""host tool" 1>&6 - else - # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 - 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 -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 -else - ok=yes - case " ${configdirs} " in - *" ld "*) ;; - *) ok=no ;; - esac - - if test $ok = yes; then - # 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)' - echo "$ac_t""host tool" 1>&6 - else - # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 - 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 -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 -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 - # We can use an host tool - LIPO_FOR_TARGET='$(LIPO)' - echo "$ac_t""host tool" 1>&6 - else - # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 - 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 -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 -else - ok=yes - case " ${configdirs} " in - *" binutils "*) ;; - *) ok=no ;; - esac - - if test $ok = yes; then - # 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)' - echo "$ac_t""host tool" 1>&6 - else - # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 - 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 -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 -else - ok=yes - case " ${configdirs} " in - *" binutils "*) ;; - *) ok=no ;; - esac - - if test $ok = yes; then - # 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)' - echo "$ac_t""host tool" 1>&6 - else - # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 - 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 -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 -else - ok=yes - case " ${configdirs} " in - *" binutils "*) ;; - *) ok=no ;; - esac - - if test $ok = yes; then - # 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)' - echo "$ac_t""host tool" 1>&6 - else - # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 - 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 -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 -else - ok=yes - case " ${configdirs} " in - *" binutils "*) ;; - *) ok=no ;; - esac - - if test $ok = yes; then - # 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)' - echo "$ac_t""host tool" 1>&6 - else - # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 - 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 -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 -else - ok=yes - case " ${configdirs} " in - *" binutils "*) ;; - *) ok=no ;; - esac - - if test $ok = yes; then - # 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)' - echo "$ac_t""host tool" 1>&6 - else - # We need a cross tool - echo "$ac_t""pre-installed" 1>&6 - fi -fi @@ -7151,27 +4738,8 @@ AR_FOR_TARGET=${AR_FOR_TARGET}${extra_arflags_for_target} RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target} NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target} -# When building target libraries, except in a Canadian cross, we use -# the same toolchain as the compiler we just built. -COMPILER_AS_FOR_TARGET='$(AS_FOR_TARGET)' -COMPILER_LD_FOR_TARGET='$(LD_FOR_TARGET)' -COMPILER_NM_FOR_TARGET='$(NM_FOR_TARGET)' -if test $host = $build; then - case " $configdirs " in - *" gcc "*) - COMPILER_AS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/as' - COMPILER_LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/collect-ld' - COMPILER_NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/nm'${extra_nmflags_for_target} - ;; - esac -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:4743: 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 +4782,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:4790: 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. @@ -7405,7 +5009,14 @@ s%@do_compare@%$do_compare%g 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%@CONFIGURED_BISON@%$CONFIGURED_BISON%g +s%@CONFIGURED_YACC@%$CONFIGURED_YACC%g +s%@CONFIGURED_M4@%$CONFIGURED_M4%g +s%@CONFIGURED_FLEX@%$CONFIGURED_FLEX%g +s%@CONFIGURED_LEX@%$CONFIGURED_LEX%g +s%@CONFIGURED_MAKEINFO@%$CONFIGURED_MAKEINFO%g +s%@bootstrap_lean@%$bootstrap_lean%g +s%@default_target@%$default_target%g /@serialization_dependencies@/r $serialization_dependencies s%@serialization_dependencies@%%g /@host_makefile_frag@/r $host_makefile_frag @@ -7417,63 +5028,75 @@ 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 s%@GDB_TK@%$GDB_TK%g -s%@INSTALL_GDB_TK@%$INSTALL_GDB_TK%g s%@build_configargs@%$build_configargs%g 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 -s%@BISON@%$BISON%g -s%@M4@%$M4%g -s%@LEX@%$LEX%g -s%@FLEX@%$FLEX%g -s%@MAKEINFO@%$MAKEINFO%g -s%@EXPECT@%$EXPECT%g -s%@RUNTEST@%$RUNTEST%g s%@AR@%$AR%g +s%@ncn_cv_AR@%$ncn_cv_AR%g s%@AS@%$AS%g +s%@ncn_cv_AS@%$ncn_cv_AS%g s%@DLLTOOL@%$DLLTOOL%g +s%@ncn_cv_DLLTOOL@%$ncn_cv_DLLTOOL%g s%@LD@%$LD%g -s%@LIPO@%$LIPO%g +s%@ncn_cv_LD@%$ncn_cv_LD%g s%@NM@%$NM%g +s%@ncn_cv_NM@%$ncn_cv_NM%g s%@RANLIB@%$RANLIB%g -s%@STRIP@%$STRIP%g +s%@ncn_cv_RANLIB@%$ncn_cv_RANLIB%g s%@WINDRES@%$WINDRES%g +s%@ncn_cv_WINDRES@%$ncn_cv_WINDRES%g s%@OBJCOPY@%$OBJCOPY%g +s%@ncn_cv_OBJCOPY@%$ncn_cv_OBJCOPY%g s%@OBJDUMP@%$OBJDUMP%g +s%@ncn_cv_OBJDUMP@%$ncn_cv_OBJDUMP%g s%@CXX@%$CXX%g s%@CFLAGS_FOR_BUILD@%$CFLAGS_FOR_BUILD%g -s%@CC_FOR_TARGET@%$CC_FOR_TARGET%g -s%@CXX_FOR_TARGET@%$CXX_FOR_TARGET%g +s%@CONFIGURED_AR_FOR_TARGET@%$CONFIGURED_AR_FOR_TARGET%g +s%@ncn_cv_CONFIGURED_AR_FOR_TARGET@%$ncn_cv_CONFIGURED_AR_FOR_TARGET%g +s%@CONFIGURED_AS_FOR_TARGET@%$CONFIGURED_AS_FOR_TARGET%g +s%@ncn_cv_CONFIGURED_AS_FOR_TARGET@%$ncn_cv_CONFIGURED_AS_FOR_TARGET%g +s%@CONFIGURED_DLLTOOL_FOR_TARGET@%$CONFIGURED_DLLTOOL_FOR_TARGET%g +s%@ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET@%$ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET%g +s%@CONFIGURED_LD_FOR_TARGET@%$CONFIGURED_LD_FOR_TARGET%g +s%@ncn_cv_CONFIGURED_LD_FOR_TARGET@%$ncn_cv_CONFIGURED_LD_FOR_TARGET%g +s%@CONFIGURED_NM_FOR_TARGET@%$CONFIGURED_NM_FOR_TARGET%g +s%@ncn_cv_CONFIGURED_NM_FOR_TARGET@%$ncn_cv_CONFIGURED_NM_FOR_TARGET%g +s%@CONFIGURED_RANLIB_FOR_TARGET@%$CONFIGURED_RANLIB_FOR_TARGET%g +s%@ncn_cv_CONFIGURED_RANLIB_FOR_TARGET@%$ncn_cv_CONFIGURED_RANLIB_FOR_TARGET%g +s%@CONFIGURED_WINDRES_FOR_TARGET@%$CONFIGURED_WINDRES_FOR_TARGET%g +s%@ncn_cv_CONFIGURED_WINDRES_FOR_TARGET@%$ncn_cv_CONFIGURED_WINDRES_FOR_TARGET%g s%@GCC_FOR_TARGET@%$GCC_FOR_TARGET%g +s%@FLAGS_FOR_TARGET@%$FLAGS_FOR_TARGET%g +s%@CC_FOR_TARGET@%$CC_FOR_TARGET%g s%@GCJ_FOR_TARGET@%$GCJ_FOR_TARGET%g s%@GFORTRAN_FOR_TARGET@%$GFORTRAN_FOR_TARGET%g +s%@CXX_FOR_TARGET@%$CXX_FOR_TARGET%g +s%@RAW_CXX_FOR_TARGET@%$RAW_CXX_FOR_TARGET%g +s%@CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@%$CXX_FOR_TARGET_FOR_RECURSIVE_MAKE%g +s%@RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@%$RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE%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 -s%@OBJDUMP_FOR_TARGET@%$OBJDUMP_FOR_TARGET%g s%@RANLIB_FOR_TARGET@%$RANLIB_FOR_TARGET%g -s%@STRIP_FOR_TARGET@%$STRIP_FOR_TARGET%g s%@WINDRES_FOR_TARGET@%$WINDRES_FOR_TARGET%g -s%@FLAGS_FOR_TARGET@%$FLAGS_FOR_TARGET%g -s%@RAW_CXX_FOR_TARGET@%$RAW_CXX_FOR_TARGET%g -s%@COMPILER_AS_FOR_TARGET@%$COMPILER_AS_FOR_TARGET%g -s%@COMPILER_LD_FOR_TARGET@%$COMPILER_LD_FOR_TARGET%g -s%@COMPILER_NM_FOR_TARGET@%$COMPILER_NM_FOR_TARGET%g 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 |