2006-02-14 Paolo Bonzini <bonzini@gnu.org>

	    Andreas Schwab  <schwab@suse.de>

	* configure: Regenerate.

config:
2006-02-14  Paolo Bonzini  <bonzini@gnu.org>
            Andreas Schwab  <schwab@suse.de>

        * acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Use correct program name.
	(ACX_CHECK_INSTALLED_TARGET_TOOL): Likewise, and always set $1.

1 files changed, 197 insertions, 137 deletions

diff --git a/configure b/configure
index 928e028..bc0f9be 100755
--- a/configure
+++ b/configure
@@ -4542,8 +4542,8 @@ fi
   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:4545: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/CC_FOR_TARGET; then
-      ac_cv_prog_CC_FOR_TARGET=$with_build_time_tools/CC_FOR_TARGET
+    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
@@ -4633,8 +4633,8 @@ fi
   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:4636: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/CXX_FOR_TARGET; then
-      ac_cv_prog_CXX_FOR_TARGET=$with_build_time_tools/CXX_FOR_TARGET
+    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
@@ -4724,8 +4724,8 @@ fi
   for ncn_progname in gcc; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
 echo "configure:4727: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/GCC_FOR_TARGET; then
-      ac_cv_prog_GCC_FOR_TARGET=$with_build_time_tools/GCC_FOR_TARGET
+    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
@@ -4810,8 +4810,8 @@ fi
   for ncn_progname in gcj; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
 echo "configure:4813: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/GCJ_FOR_TARGET; then
-      ac_cv_prog_GCJ_FOR_TARGET=$with_build_time_tools/GCJ_FOR_TARGET
+    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
@@ -4901,8 +4901,8 @@ fi
   for ncn_progname in gfortran; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
 echo "configure:4904: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/GFORTRAN_FOR_TARGET; then
-      ac_cv_prog_GFORTRAN_FOR_TARGET=$with_build_time_tools/GFORTRAN_FOR_TARGET
+    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
@@ -5054,11 +5054,15 @@ 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 ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5059: checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools" >&5
-    AR_FOR_TARGET=`cd $with_build_time_tools && pwd`/AR_FOR_TARGET
-    ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET
-    echo "$ac_t""$ac_cv_path_AR_FOR_TARGET" 1>&6
+    echo $ac_n "checking for ar in $with_build_time_tools""... $ac_c" 1>&6
+echo "configure:5059: 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=
@@ -5069,7 +5073,7 @@ 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:5073: checking for $ac_word" >&5
+echo "configure:5077: 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
@@ -5106,9 +5110,9 @@ 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:5110: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/AR_FOR_TARGET; then
-      ac_cv_prog_AR_FOR_TARGET=$with_build_time_tools/AR_FOR_TARGET
+echo "configure:5114: 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
@@ -5123,7 +5127,7 @@ if test -z "$ac_cv_prog_AR_FOR_TARGET"; 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:5127: checking for $ac_word" >&5
+echo "configure:5131: 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
@@ -5154,7 +5158,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5158: checking for $ac_word" >&5
+echo "configure:5162: 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
@@ -5194,6 +5198,8 @@ if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then
   fi
 fi
 
+else
+  AR_FOR_TARGET=$ac_cv_path_AR_FOR_TARGET
 fi
 
 
@@ -5201,11 +5207,15 @@ fi
 
 if test -z "$ac_cv_path_AS_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5206: checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools" >&5
-    AS_FOR_TARGET=`cd $with_build_time_tools && pwd`/AS_FOR_TARGET
-    ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET
-    echo "$ac_t""$ac_cv_path_AS_FOR_TARGET" 1>&6
+    echo $ac_n "checking for as in $with_build_time_tools""... $ac_c" 1>&6
+echo "configure:5212: 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=
@@ -5216,7 +5226,7 @@ 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:5220: checking for $ac_word" >&5
+echo "configure:5230: 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
@@ -5253,9 +5263,9 @@ 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:5257: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/AS_FOR_TARGET; then
-      ac_cv_prog_AS_FOR_TARGET=$with_build_time_tools/AS_FOR_TARGET
+echo "configure:5267: 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
@@ -5270,7 +5280,7 @@ if test -z "$ac_cv_prog_AS_FOR_TARGET"; 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:5274: checking for $ac_word" >&5
+echo "configure:5284: 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
@@ -5301,7 +5311,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5305: checking for $ac_word" >&5
+echo "configure:5315: 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
@@ -5341,6 +5351,8 @@ if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then
   fi
 fi
 
+else
+  AS_FOR_TARGET=$ac_cv_path_AS_FOR_TARGET
 fi
 
 
@@ -5348,11 +5360,15 @@ fi
 
 if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5353: checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools" >&5
-    DLLTOOL_FOR_TARGET=`cd $with_build_time_tools && pwd`/DLLTOOL_FOR_TARGET
-    ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET
-    echo "$ac_t""$ac_cv_path_DLLTOOL_FOR_TARGET" 1>&6
+    echo $ac_n "checking for dlltool in $with_build_time_tools""... $ac_c" 1>&6
+echo "configure:5365: 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=
@@ -5363,7 +5379,7 @@ 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:5367: checking for $ac_word" >&5
+echo "configure:5383: 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
@@ -5400,9 +5416,9 @@ 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:5404: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/DLLTOOL_FOR_TARGET; then
-      ac_cv_prog_DLLTOOL_FOR_TARGET=$with_build_time_tools/DLLTOOL_FOR_TARGET
+echo "configure:5420: 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
@@ -5417,7 +5433,7 @@ if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET"; 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:5421: checking for $ac_word" >&5
+echo "configure:5437: 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
@@ -5448,7 +5464,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5452: checking for $ac_word" >&5
+echo "configure:5468: 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
@@ -5488,6 +5504,8 @@ if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then
   fi
 fi
 
+else
+  DLLTOOL_FOR_TARGET=$ac_cv_path_DLLTOOL_FOR_TARGET
 fi
 
 
@@ -5495,11 +5513,15 @@ fi
 
 if test -z "$ac_cv_path_LD_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5500: checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools" >&5
-    LD_FOR_TARGET=`cd $with_build_time_tools && pwd`/LD_FOR_TARGET
-    ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET
-    echo "$ac_t""$ac_cv_path_LD_FOR_TARGET" 1>&6
+    echo $ac_n "checking for ld in $with_build_time_tools""... $ac_c" 1>&6
+echo "configure:5518: 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=
@@ -5510,7 +5532,7 @@ if test -z "$ac_cv_path_LD_FOR_TARGET" ; then
   # Extract the first word of "ld", so it can be a program name with args.
 set dummy ld; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5514: checking for $ac_word" >&5
+echo "configure:5536: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5547,9 +5569,9 @@ 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:5551: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/LD_FOR_TARGET; then
-      ac_cv_prog_LD_FOR_TARGET=$with_build_time_tools/LD_FOR_TARGET
+echo "configure:5573: 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
@@ -5564,7 +5586,7 @@ if test -z "$ac_cv_prog_LD_FOR_TARGET"; 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:5568: checking for $ac_word" >&5
+echo "configure:5590: 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
@@ -5595,7 +5617,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5599: checking for $ac_word" >&5
+echo "configure:5621: 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
@@ -5635,6 +5657,8 @@ if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then
   fi
 fi
 
+else
+  LD_FOR_TARGET=$ac_cv_path_LD_FOR_TARGET
 fi
 
 
@@ -5642,11 +5666,15 @@ fi
 
 if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5647: checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools" >&5
-    LIPO_FOR_TARGET=`cd $with_build_time_tools && pwd`/LIPO_FOR_TARGET
-    ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET
-    echo "$ac_t""$ac_cv_path_LIPO_FOR_TARGET" 1>&6
+    echo $ac_n "checking for lipo in $with_build_time_tools""... $ac_c" 1>&6
+echo "configure:5671: 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=
@@ -5657,7 +5685,7 @@ if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5661: checking for $ac_word" >&5
+echo "configure:5689: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LIPO_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5694,9 +5722,9 @@ 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:5698: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/LIPO_FOR_TARGET; then
-      ac_cv_prog_LIPO_FOR_TARGET=$with_build_time_tools/LIPO_FOR_TARGET
+echo "configure:5726: 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
@@ -5711,7 +5739,7 @@ if test -z "$ac_cv_prog_LIPO_FOR_TARGET"; 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:5715: checking for $ac_word" >&5
+echo "configure:5743: 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
@@ -5742,7 +5770,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5746: checking for $ac_word" >&5
+echo "configure:5774: 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
@@ -5782,6 +5810,8 @@ if test -z "$ac_cv_prog_LIPO_FOR_TARGET" ; then
   fi
 fi
 
+else
+  LIPO_FOR_TARGET=$ac_cv_path_LIPO_FOR_TARGET
 fi
 
 
@@ -5789,11 +5819,15 @@ fi
 
 if test -z "$ac_cv_path_NM_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5794: checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools" >&5
-    NM_FOR_TARGET=`cd $with_build_time_tools && pwd`/NM_FOR_TARGET
-    ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET
-    echo "$ac_t""$ac_cv_path_NM_FOR_TARGET" 1>&6
+    echo $ac_n "checking for nm in $with_build_time_tools""... $ac_c" 1>&6
+echo "configure:5824: 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=
@@ -5804,7 +5838,7 @@ if test -z "$ac_cv_path_NM_FOR_TARGET" ; then
   # Extract the first word of "nm", so it can be a program name with args.
 set dummy nm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5808: checking for $ac_word" >&5
+echo "configure:5842: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5841,9 +5875,9 @@ 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:5845: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/NM_FOR_TARGET; then
-      ac_cv_prog_NM_FOR_TARGET=$with_build_time_tools/NM_FOR_TARGET
+echo "configure:5879: 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
@@ -5858,7 +5892,7 @@ if test -z "$ac_cv_prog_NM_FOR_TARGET"; 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:5862: checking for $ac_word" >&5
+echo "configure:5896: 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
@@ -5889,7 +5923,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5893: checking for $ac_word" >&5
+echo "configure:5927: 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
@@ -5929,6 +5963,8 @@ if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then
   fi
 fi
 
+else
+  NM_FOR_TARGET=$ac_cv_path_NM_FOR_TARGET
 fi
 
 
@@ -5936,11 +5972,15 @@ fi
 
 if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5941: checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools" >&5
-    OBJDUMP_FOR_TARGET=`cd $with_build_time_tools && pwd`/OBJDUMP_FOR_TARGET
-    ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET
-    echo "$ac_t""$ac_cv_path_OBJDUMP_FOR_TARGET" 1>&6
+    echo $ac_n "checking for objdump in $with_build_time_tools""... $ac_c" 1>&6
+echo "configure:5977: 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=
@@ -5951,7 +5991,7 @@ 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:5955: checking for $ac_word" >&5
+echo "configure:5995: 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
@@ -5988,9 +6028,9 @@ 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:5992: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/OBJDUMP_FOR_TARGET; then
-      ac_cv_prog_OBJDUMP_FOR_TARGET=$with_build_time_tools/OBJDUMP_FOR_TARGET
+echo "configure:6032: 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
@@ -6005,7 +6045,7 @@ if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET"; 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:6009: checking for $ac_word" >&5
+echo "configure:6049: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6036,7 +6076,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6040: checking for $ac_word" >&5
+echo "configure:6080: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6076,6 +6116,8 @@ if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" ; then
   fi
 fi
 
+else
+  OBJDUMP_FOR_TARGET=$ac_cv_path_OBJDUMP_FOR_TARGET
 fi
 
 
@@ -6083,11 +6125,15 @@ fi
 
 if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6088: checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools" >&5
-    RANLIB_FOR_TARGET=`cd $with_build_time_tools && pwd`/RANLIB_FOR_TARGET
-    ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET
-    echo "$ac_t""$ac_cv_path_RANLIB_FOR_TARGET" 1>&6
+    echo $ac_n "checking for ranlib in $with_build_time_tools""... $ac_c" 1>&6
+echo "configure:6130: 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=
@@ -6098,7 +6144,7 @@ if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6102: checking for $ac_word" >&5
+echo "configure:6148: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6135,9 +6181,9 @@ 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:6139: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/RANLIB_FOR_TARGET; then
-      ac_cv_prog_RANLIB_FOR_TARGET=$with_build_time_tools/RANLIB_FOR_TARGET
+echo "configure:6185: 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
@@ -6152,7 +6198,7 @@ if test -z "$ac_cv_prog_RANLIB_FOR_TARGET"; 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:6156: checking for $ac_word" >&5
+echo "configure:6202: 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
@@ -6183,7 +6229,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6187: checking for $ac_word" >&5
+echo "configure:6233: 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
@@ -6223,6 +6269,8 @@ if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then
   fi
 fi
 
+else
+  RANLIB_FOR_TARGET=$ac_cv_path_RANLIB_FOR_TARGET
 fi
 
 
@@ -6230,11 +6278,15 @@ fi
 
 if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6235: checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools" >&5
-    STRIP_FOR_TARGET=`cd $with_build_time_tools && pwd`/STRIP_FOR_TARGET
-    ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET
-    echo "$ac_t""$ac_cv_path_STRIP_FOR_TARGET" 1>&6
+    echo $ac_n "checking for strip in $with_build_time_tools""... $ac_c" 1>&6
+echo "configure:6283: 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=
@@ -6245,7 +6297,7 @@ 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:6249: checking for $ac_word" >&5
+echo "configure:6301: 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
@@ -6282,9 +6334,9 @@ 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:6286: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/STRIP_FOR_TARGET; then
-      ac_cv_prog_STRIP_FOR_TARGET=$with_build_time_tools/STRIP_FOR_TARGET
+echo "configure:6338: 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
@@ -6299,7 +6351,7 @@ if test -z "$ac_cv_prog_STRIP_FOR_TARGET"; 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:6303: checking for $ac_word" >&5
+echo "configure:6355: 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
@@ -6330,7 +6382,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6334: checking for $ac_word" >&5
+echo "configure:6386: 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
@@ -6370,6 +6422,8 @@ if test -z "$ac_cv_prog_STRIP_FOR_TARGET" ; then
   fi
 fi
 
+else
+  STRIP_FOR_TARGET=$ac_cv_path_STRIP_FOR_TARGET
 fi
 
 
@@ -6377,11 +6431,15 @@ fi
 
 if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6382: checking for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools" >&5
-    WINDRES_FOR_TARGET=`cd $with_build_time_tools && pwd`/WINDRES_FOR_TARGET
-    ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET
-    echo "$ac_t""$ac_cv_path_WINDRES_FOR_TARGET" 1>&6
+    echo $ac_n "checking for windres in $with_build_time_tools""... $ac_c" 1>&6
+echo "configure:6436: 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=
@@ -6392,7 +6450,7 @@ 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:6396: checking for $ac_word" >&5
+echo "configure:6454: 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
@@ -6429,9 +6487,9 @@ 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:6433: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/WINDRES_FOR_TARGET; then
-      ac_cv_prog_WINDRES_FOR_TARGET=$with_build_time_tools/WINDRES_FOR_TARGET
+echo "configure:6491: 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
@@ -6446,7 +6504,7 @@ if test -z "$ac_cv_prog_WINDRES_FOR_TARGET"; 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:6450: checking for $ac_word" >&5
+echo "configure:6508: 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
@@ -6477,7 +6535,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6481: checking for $ac_word" >&5
+echo "configure:6539: 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
@@ -6517,13 +6575,15 @@ if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then
   fi
 fi
 
+else
+  WINDRES_FOR_TARGET=$ac_cv_path_WINDRES_FOR_TARGET
 fi
 
 
 RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
 
 echo $ac_n "checking where to find the target ar""... $ac_c" 1>&6
-echo "configure:6527: checking where to find the target ar" >&5
+echo "configure:6587: 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
@@ -6556,7 +6616,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target as""... $ac_c" 1>&6
-echo "configure:6560: checking where to find the target as" >&5
+echo "configure:6620: 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
@@ -6589,7 +6649,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target cc""... $ac_c" 1>&6
-echo "configure:6593: checking where to find the target cc" >&5
+echo "configure:6653: 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
@@ -6622,7 +6682,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target c++""... $ac_c" 1>&6
-echo "configure:6626: checking where to find the target c++" >&5
+echo "configure:6686: 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
@@ -6658,7 +6718,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target c++ for libstdc++""... $ac_c" 1>&6
-echo "configure:6662: checking where to find the target c++ for libstdc++" >&5
+echo "configure:6722: 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
@@ -6694,7 +6754,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target dlltool""... $ac_c" 1>&6
-echo "configure:6698: checking where to find the target dlltool" >&5
+echo "configure:6758: 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
@@ -6727,7 +6787,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target gcc""... $ac_c" 1>&6
-echo "configure:6731: checking where to find the target gcc" >&5
+echo "configure:6791: 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
@@ -6760,7 +6820,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target gcj""... $ac_c" 1>&6
-echo "configure:6764: checking where to find the target gcj" >&5
+echo "configure:6824: 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
@@ -6796,7 +6856,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target gfortran""... $ac_c" 1>&6
-echo "configure:6800: checking where to find the target gfortran" >&5
+echo "configure:6860: 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
@@ -6832,7 +6892,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target ld""... $ac_c" 1>&6
-echo "configure:6836: checking where to find the target ld" >&5
+echo "configure:6896: 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
@@ -6865,7 +6925,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target lipo""... $ac_c" 1>&6
-echo "configure:6869: checking where to find the target lipo" >&5
+echo "configure:6929: 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
@@ -6888,7 +6948,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target nm""... $ac_c" 1>&6
-echo "configure:6892: checking where to find the target nm" >&5
+echo "configure:6952: 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
@@ -6921,7 +6981,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target objdump""... $ac_c" 1>&6
-echo "configure:6925: checking where to find the target objdump" >&5
+echo "configure:6985: 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
@@ -6954,7 +7014,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target ranlib""... $ac_c" 1>&6
-echo "configure:6958: checking where to find the target ranlib" >&5
+echo "configure:7018: 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
@@ -6987,7 +7047,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target strip""... $ac_c" 1>&6
-echo "configure:6991: checking where to find the target strip" >&5
+echo "configure:7051: 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
@@ -7020,7 +7080,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target windres""... $ac_c" 1>&6
-echo "configure:7024: checking where to find the target windres" >&5
+echo "configure:7084: 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
@@ -7081,7 +7141,7 @@ fi
 
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:7085: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:7145: 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"