From be9125155e0a003a35f2b035d901f48a5f89deb0 Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Fri, 9 Apr 2004 05:15:06 +0000 Subject: [PATCH] re PR bootstrap/14871 (Non-unified-tree ordinary cross-compiler builds default to stupid names for tools) PR bootstrap/14871 * Makefile.tpl: If we don't have built-in-tree target tools, use the ones found by configure rather than hacking around with program_transform_name. * configure.in: Give Makefile.tpl the information necessary to do that. * Makefile.in: Regenerate. * configure: Regenerate. From-SVN: r80542 --- ChangeLog | 11 ++ Makefile.in | 21 ++-- Makefile.tpl | 21 ++-- configure | 334 ++++++++++++++++++++++++++++++++--------------------------- configure.in | 31 ++++-- 5 files changed, 242 insertions(+), 176 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0cdd9ec..30c49ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2004-04-09 Nathanael Nerode + + PR bootstrap/14871 + * Makefile.tpl: If we don't have built-in-tree target tools, + use the ones found by configure rather than hacking around with + program_transform_name. + * configure.in: Give Makefile.tpl the information necessary + to do that. + * Makefile.in: Regenerate. + * configure: Regenerate. + 2004-04-06 Nathanael Nerode PR bootstrap/14760 diff --git a/Makefile.in b/Makefile.in index 5935660..bf7bc3e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -246,6 +246,7 @@ TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs: FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ AR_FOR_TARGET=@AR_FOR_TARGET@ +CONFIGURED_AR_FOR_TARGET=@CONFIGURED_AR_FOR_TARGET@ USUAL_AR_FOR_TARGET = ` \ if [ -f $$r/binutils/ar ] ; then \ echo $$r/binutils/ar ; \ @@ -253,11 +254,12 @@ USUAL_AR_FOR_TARGET = ` \ if [ '$(host)' = '$(target)' ] ; then \ echo $(AR); \ else \ - echo ar | sed '$(program_transform_name)' ; \ + echo $(CONFIGURED_AR_FOR_TARGET) ; \ fi; \ fi` AS_FOR_TARGET=@AS_FOR_TARGET@ +CONFIGURED_AS_FOR_TARGET=@CONFIGURED_AS_FOR_TARGET@ USUAL_AS_FOR_TARGET = ` \ if [ -f $$r/gas/as-new ] ; then \ echo $$r/gas/as-new ; \ @@ -267,7 +269,7 @@ USUAL_AS_FOR_TARGET = ` \ if [ '$(host)' = '$(target)' ] ; then \ echo $(AS); \ else \ - echo as | sed '$(program_transform_name)' ; \ + echo $(CONFIGURED_AS_FOR_TARGET) ; \ fi; \ fi` @@ -293,6 +295,7 @@ CXXFLAGS_FOR_TARGET = $(CXXFLAGS) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ +CONFIGURED_DLLTOOL_FOR_TARGET=@CONFIGURED_DLLTOOL_FOR_TARGET@ USUAL_DLLTOOL_FOR_TARGET = ` \ if [ -f $$r/binutils/dlltool ] ; then \ echo $$r/binutils/dlltool ; \ @@ -300,13 +303,14 @@ USUAL_DLLTOOL_FOR_TARGET = ` \ if [ '$(host)' = '$(target)' ] ; then \ echo $(DLLTOOL); \ else \ - echo dlltool | sed '$(program_transform_name)' ; \ + echo $(CONFIGURED_DLLTOOL_FOR_TARGET) ; \ fi; \ fi` GCJ_FOR_TARGET = @GCJ_FOR_TARGET@ LD_FOR_TARGET=@LD_FOR_TARGET@ +CONFIGURED_LD_FOR_TARGET=@CONFIGURED_LD_FOR_TARGET@ USUAL_LD_FOR_TARGET = ` \ if [ -f $$r/ld/ld-new ] ; then \ echo $$r/ld/ld-new ; \ @@ -316,13 +320,14 @@ USUAL_LD_FOR_TARGET = ` \ if [ '$(host)' = '$(target)' ] ; then \ echo $(LD); \ else \ - echo ld | sed '$(program_transform_name)' ; \ + echo $(CONFIGURED_LD_FOR_TARGET) ; \ fi; \ fi` LDFLAGS_FOR_TARGET = NM_FOR_TARGET=@NM_FOR_TARGET@ +CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@ USUAL_NM_FOR_TARGET = ` \ if [ -f $$r/binutils/nm-new ] ; then \ echo $$r/binutils/nm-new ; \ @@ -332,11 +337,12 @@ USUAL_NM_FOR_TARGET = ` \ if [ '$(host)' = '$(target)' ] ; then \ echo $(NM); \ else \ - echo nm | sed '$(program_transform_name)' ; \ + echo $(CONFIGURED_NM_FOR_TARGET) ; \ fi; \ fi` RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@ +CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@ USUAL_RANLIB_FOR_TARGET = ` \ if [ -f $$r/binutils/ranlib ] ; then \ echo $$r/binutils/ranlib ; \ @@ -348,11 +354,12 @@ USUAL_RANLIB_FOR_TARGET = ` \ echo ranlib; \ fi; \ else \ - echo ranlib | sed '$(program_transform_name)' ; \ + echo $(CONFIGURED_RANLIB_FOR_TARGET) ; \ fi; \ fi` WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@ +CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@ USUAL_WINDRES_FOR_TARGET = ` \ if [ -f $$r/binutils/windres ] ; then \ echo $$r/binutils/windres ; \ @@ -360,7 +367,7 @@ USUAL_WINDRES_FOR_TARGET = ` \ if [ '$(host)' = '$(target)' ] ; then \ echo $(WINDRES); \ else \ - echo windres | sed '$(program_transform_name)' ; \ + echo $(CONFIGURED_WINDRES_FOR_TARGET) ; \ fi; \ fi` diff --git a/Makefile.tpl b/Makefile.tpl index cd7e06e..e52f709 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -249,6 +249,7 @@ TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs: FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ AR_FOR_TARGET=@AR_FOR_TARGET@ +CONFIGURED_AR_FOR_TARGET=@CONFIGURED_AR_FOR_TARGET@ USUAL_AR_FOR_TARGET = ` \ if [ -f $$r/binutils/ar ] ; then \ echo $$r/binutils/ar ; \ @@ -256,11 +257,12 @@ USUAL_AR_FOR_TARGET = ` \ if [ '$(host)' = '$(target)' ] ; then \ echo $(AR); \ else \ - echo ar | sed '$(program_transform_name)' ; \ + echo $(CONFIGURED_AR_FOR_TARGET) ; \ fi; \ fi` AS_FOR_TARGET=@AS_FOR_TARGET@ +CONFIGURED_AS_FOR_TARGET=@CONFIGURED_AS_FOR_TARGET@ USUAL_AS_FOR_TARGET = ` \ if [ -f $$r/gas/as-new ] ; then \ echo $$r/gas/as-new ; \ @@ -270,7 +272,7 @@ USUAL_AS_FOR_TARGET = ` \ if [ '$(host)' = '$(target)' ] ; then \ echo $(AS); \ else \ - echo as | sed '$(program_transform_name)' ; \ + echo $(CONFIGURED_AS_FOR_TARGET) ; \ fi; \ fi` @@ -296,6 +298,7 @@ CXXFLAGS_FOR_TARGET = $(CXXFLAGS) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ +CONFIGURED_DLLTOOL_FOR_TARGET=@CONFIGURED_DLLTOOL_FOR_TARGET@ USUAL_DLLTOOL_FOR_TARGET = ` \ if [ -f $$r/binutils/dlltool ] ; then \ echo $$r/binutils/dlltool ; \ @@ -303,13 +306,14 @@ USUAL_DLLTOOL_FOR_TARGET = ` \ if [ '$(host)' = '$(target)' ] ; then \ echo $(DLLTOOL); \ else \ - echo dlltool | sed '$(program_transform_name)' ; \ + echo $(CONFIGURED_DLLTOOL_FOR_TARGET) ; \ fi; \ fi` GCJ_FOR_TARGET = @GCJ_FOR_TARGET@ LD_FOR_TARGET=@LD_FOR_TARGET@ +CONFIGURED_LD_FOR_TARGET=@CONFIGURED_LD_FOR_TARGET@ USUAL_LD_FOR_TARGET = ` \ if [ -f $$r/ld/ld-new ] ; then \ echo $$r/ld/ld-new ; \ @@ -319,13 +323,14 @@ USUAL_LD_FOR_TARGET = ` \ if [ '$(host)' = '$(target)' ] ; then \ echo $(LD); \ else \ - echo ld | sed '$(program_transform_name)' ; \ + echo $(CONFIGURED_LD_FOR_TARGET) ; \ fi; \ fi` LDFLAGS_FOR_TARGET = NM_FOR_TARGET=@NM_FOR_TARGET@ +CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@ USUAL_NM_FOR_TARGET = ` \ if [ -f $$r/binutils/nm-new ] ; then \ echo $$r/binutils/nm-new ; \ @@ -335,11 +340,12 @@ USUAL_NM_FOR_TARGET = ` \ if [ '$(host)' = '$(target)' ] ; then \ echo $(NM); \ else \ - echo nm | sed '$(program_transform_name)' ; \ + echo $(CONFIGURED_NM_FOR_TARGET) ; \ fi; \ fi` RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@ +CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@ USUAL_RANLIB_FOR_TARGET = ` \ if [ -f $$r/binutils/ranlib ] ; then \ echo $$r/binutils/ranlib ; \ @@ -351,11 +357,12 @@ USUAL_RANLIB_FOR_TARGET = ` \ echo ranlib; \ fi; \ else \ - echo ranlib | sed '$(program_transform_name)' ; \ + echo $(CONFIGURED_RANLIB_FOR_TARGET) ; \ fi; \ fi` WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@ +CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@ USUAL_WINDRES_FOR_TARGET = ` \ if [ -f $$r/binutils/windres ] ; then \ echo $$r/binutils/windres ; \ @@ -363,7 +370,7 @@ USUAL_WINDRES_FOR_TARGET = ` \ if [ '$(host)' = '$(target)' ] ; then \ echo $(WINDRES); \ else \ - echo windres | sed '$(program_transform_name)' ; \ + echo $(CONFIGURED_WINDRES_FOR_TARGET) ; \ fi; \ fi` diff --git a/configure b/configure index 3402433..f8c5cfe 100755 --- a/configure +++ b/configure @@ -3900,71 +3900,71 @@ fi set dummy ${ncn_target_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:3903: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then +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 "$AR_FOR_TARGET"; then - ac_cv_prog_AR_FOR_TARGET="$AR_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_AR_FOR_TARGET="${ncn_target_tool_prefix}ar" + ac_cv_prog_CONFIGURED_AR_FOR_TARGET="${ncn_target_tool_prefix}ar" 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_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_AR_FOR_TARGET" ; then +if test -z "$ac_cv_prog_CONFIGURED_AR_FOR_TARGET" ; then if test $build = $target ; then - ncn_cv_AR_FOR_TARGET=$AR_FOR_TARGET + 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:3936: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR_FOR_TARGET'+set}'`\" = set"; then +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 "$ncn_cv_AR_FOR_TARGET"; then - ac_cv_prog_ncn_cv_AR_FOR_TARGET="$ncn_cv_AR_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_ncn_cv_AR_FOR_TARGET="ar" + ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET="ar" break fi done IFS="$ac_save_ifs" - test -z "$ac_cv_prog_ncn_cv_AR_FOR_TARGET" && ac_cv_prog_ncn_cv_AR_FOR_TARGET="ar" + test -z "$ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET="ar" fi fi -ncn_cv_AR_FOR_TARGET="$ac_cv_prog_ncn_cv_AR_FOR_TARGET" -if test -n "$ncn_cv_AR_FOR_TARGET"; then - echo "$ac_t""$ncn_cv_AR_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 - AR_FOR_TARGET=$ncn_cv_AR_FOR_TARGET + CONFIGURED_AR_FOR_TARGET=$ncn_cv_CONFIGURED_AR_FOR_TARGET else - AR_FOR_TARGET="${ncn_target_tool_prefix}ar" + CONFIGURED_AR_FOR_TARGET="${ncn_target_tool_prefix}ar" fi else - AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET" + CONFIGURED_AR_FOR_TARGET="$ac_cv_prog_CONFIGURED_AR_FOR_TARGET" fi if test -n "$ncn_target_tool_prefix"; then @@ -3972,71 +3972,71 @@ fi set dummy ${ncn_target_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:3975: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then +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 "$AS_FOR_TARGET"; then - ac_cv_prog_AS_FOR_TARGET="$AS_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_AS_FOR_TARGET="${ncn_target_tool_prefix}as" + ac_cv_prog_CONFIGURED_AS_FOR_TARGET="${ncn_target_tool_prefix}as" 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 +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 -if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then +if test -z "$ac_cv_prog_CONFIGURED_AS_FOR_TARGET" ; then if test $build = $target ; then - ncn_cv_AS_FOR_TARGET=$AS_FOR_TARGET + 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:4008: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS_FOR_TARGET'+set}'`\" = set"; then +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 "$ncn_cv_AS_FOR_TARGET"; then - ac_cv_prog_ncn_cv_AS_FOR_TARGET="$ncn_cv_AS_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_ncn_cv_AS_FOR_TARGET="as" + ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET="as" break fi done IFS="$ac_save_ifs" - test -z "$ac_cv_prog_ncn_cv_AS_FOR_TARGET" && ac_cv_prog_ncn_cv_AS_FOR_TARGET="as" + test -z "$ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET="as" fi fi -ncn_cv_AS_FOR_TARGET="$ac_cv_prog_ncn_cv_AS_FOR_TARGET" -if test -n "$ncn_cv_AS_FOR_TARGET"; then - echo "$ac_t""$ncn_cv_AS_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 - AS_FOR_TARGET=$ncn_cv_AS_FOR_TARGET + CONFIGURED_AS_FOR_TARGET=$ncn_cv_CONFIGURED_AS_FOR_TARGET else - AS_FOR_TARGET="${ncn_target_tool_prefix}as" + CONFIGURED_AS_FOR_TARGET="${ncn_target_tool_prefix}as" fi else - AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET" + CONFIGURED_AS_FOR_TARGET="$ac_cv_prog_CONFIGURED_AS_FOR_TARGET" fi if test -n "$ncn_target_tool_prefix"; then @@ -4044,71 +4044,71 @@ fi set dummy ${ncn_target_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:4047: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then +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 "$DLLTOOL_FOR_TARGET"; then - ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_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_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}dlltool" + ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}dlltool" 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_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_DLLTOOL_FOR_TARGET" ; then +if test -z "$ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET" ; then if test $build = $target ; then - ncn_cv_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET + 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:4080: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then +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 "$ncn_cv_DLLTOOL_FOR_TARGET"; then - ac_cv_prog_ncn_cv_DLLTOOL_FOR_TARGET="$ncn_cv_DLLTOOL_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_ncn_cv_DLLTOOL_FOR_TARGET="dlltool" + ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET="dlltool" break fi done IFS="$ac_save_ifs" - test -z "$ac_cv_prog_ncn_cv_DLLTOOL_FOR_TARGET" && ac_cv_prog_ncn_cv_DLLTOOL_FOR_TARGET="dlltool" + test -z "$ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET="dlltool" fi fi -ncn_cv_DLLTOOL_FOR_TARGET="$ac_cv_prog_ncn_cv_DLLTOOL_FOR_TARGET" -if test -n "$ncn_cv_DLLTOOL_FOR_TARGET"; then - echo "$ac_t""$ncn_cv_DLLTOOL_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 - DLLTOOL_FOR_TARGET=$ncn_cv_DLLTOOL_FOR_TARGET + CONFIGURED_DLLTOOL_FOR_TARGET=$ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET else - DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}dlltool" + CONFIGURED_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}dlltool" fi else - DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET" + CONFIGURED_DLLTOOL_FOR_TARGET="$ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET" fi if test -n "$ncn_target_tool_prefix"; then @@ -4116,71 +4116,71 @@ fi set dummy ${ncn_target_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:4119: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then +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 "$LD_FOR_TARGET"; then - ac_cv_prog_LD_FOR_TARGET="$LD_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_LD_FOR_TARGET="${ncn_target_tool_prefix}ld" + ac_cv_prog_CONFIGURED_LD_FOR_TARGET="${ncn_target_tool_prefix}ld" 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 +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_LD_FOR_TARGET" ; then +if test -z "$ac_cv_prog_CONFIGURED_LD_FOR_TARGET" ; then if test $build = $target ; then - ncn_cv_LD_FOR_TARGET=$LD_FOR_TARGET + 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:4152: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD_FOR_TARGET'+set}'`\" = set"; then +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 - if test -n "$ncn_cv_LD_FOR_TARGET"; then - ac_cv_prog_ncn_cv_LD_FOR_TARGET="$ncn_cv_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_ncn_cv_LD_FOR_TARGET="ld" + ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET="ld" break fi done IFS="$ac_save_ifs" - test -z "$ac_cv_prog_ncn_cv_LD_FOR_TARGET" && ac_cv_prog_ncn_cv_LD_FOR_TARGET="ld" + test -z "$ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET="ld" fi fi -ncn_cv_LD_FOR_TARGET="$ac_cv_prog_ncn_cv_LD_FOR_TARGET" -if test -n "$ncn_cv_LD_FOR_TARGET"; then - echo "$ac_t""$ncn_cv_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 - LD_FOR_TARGET=$ncn_cv_LD_FOR_TARGET + CONFIGURED_LD_FOR_TARGET=$ncn_cv_CONFIGURED_LD_FOR_TARGET else - LD_FOR_TARGET="${ncn_target_tool_prefix}ld" + CONFIGURED_LD_FOR_TARGET="${ncn_target_tool_prefix}ld" fi else - LD_FOR_TARGET="$ac_cv_prog_LD_FOR_TARGET" + CONFIGURED_LD_FOR_TARGET="$ac_cv_prog_CONFIGURED_LD_FOR_TARGET" fi if test -n "$ncn_target_tool_prefix"; then @@ -4188,71 +4188,71 @@ fi set dummy ${ncn_target_tool_prefix}nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:4191: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then +if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_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 "$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_NM_FOR_TARGET="${ncn_target_tool_prefix}nm" + ac_cv_prog_CONFIGURED_NM_FOR_TARGET="${ncn_target_tool_prefix}nm" 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 +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_NM_FOR_TARGET" ; then +if test -z "$ac_cv_prog_CONFIGURED_NM_FOR_TARGET" ; then if test $build = $target ; then - ncn_cv_NM_FOR_TARGET=$NM_FOR_TARGET + 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:4224: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM_FOR_TARGET'+set}'`\" = set"; then +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 - if test -n "$ncn_cv_NM_FOR_TARGET"; then - ac_cv_prog_ncn_cv_NM_FOR_TARGET="$ncn_cv_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_ncn_cv_NM_FOR_TARGET="nm" + ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET="nm" break fi done IFS="$ac_save_ifs" - test -z "$ac_cv_prog_ncn_cv_NM_FOR_TARGET" && ac_cv_prog_ncn_cv_NM_FOR_TARGET="nm" + test -z "$ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET="nm" fi fi -ncn_cv_NM_FOR_TARGET="$ac_cv_prog_ncn_cv_NM_FOR_TARGET" -if test -n "$ncn_cv_NM_FOR_TARGET"; then - echo "$ac_t""$ncn_cv_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 - NM_FOR_TARGET=$ncn_cv_NM_FOR_TARGET + CONFIGURED_NM_FOR_TARGET=$ncn_cv_CONFIGURED_NM_FOR_TARGET else - NM_FOR_TARGET="${ncn_target_tool_prefix}nm" + CONFIGURED_NM_FOR_TARGET="${ncn_target_tool_prefix}nm" fi else - NM_FOR_TARGET="$ac_cv_prog_NM_FOR_TARGET" + CONFIGURED_NM_FOR_TARGET="$ac_cv_prog_CONFIGURED_NM_FOR_TARGET" fi if test -n "$ncn_target_tool_prefix"; then @@ -4260,71 +4260,71 @@ fi set dummy ${ncn_target_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:4263: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then +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 "$RANLIB_FOR_TARGET"; then - ac_cv_prog_RANLIB_FOR_TARGET="$RANLIB_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_RANLIB_FOR_TARGET="${ncn_target_tool_prefix}ranlib" + ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET="${ncn_target_tool_prefix}ranlib" 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_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_RANLIB_FOR_TARGET" ; then +if test -z "$ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET" ; then if test $build = $target ; then - ncn_cv_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET + 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:4296: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB_FOR_TARGET'+set}'`\" = set"; then +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 "$ncn_cv_RANLIB_FOR_TARGET"; then - ac_cv_prog_ncn_cv_RANLIB_FOR_TARGET="$ncn_cv_RANLIB_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_ncn_cv_RANLIB_FOR_TARGET="ranlib" + ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET="ranlib" break fi done IFS="$ac_save_ifs" - test -z "$ac_cv_prog_ncn_cv_RANLIB_FOR_TARGET" && ac_cv_prog_ncn_cv_RANLIB_FOR_TARGET=":" + test -z "$ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET=":" fi fi -ncn_cv_RANLIB_FOR_TARGET="$ac_cv_prog_ncn_cv_RANLIB_FOR_TARGET" -if test -n "$ncn_cv_RANLIB_FOR_TARGET"; then - echo "$ac_t""$ncn_cv_RANLIB_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 - RANLIB_FOR_TARGET=$ncn_cv_RANLIB_FOR_TARGET + CONFIGURED_RANLIB_FOR_TARGET=$ncn_cv_CONFIGURED_RANLIB_FOR_TARGET else - RANLIB_FOR_TARGET=":" + CONFIGURED_RANLIB_FOR_TARGET=":" fi else - RANLIB_FOR_TARGET="$ac_cv_prog_RANLIB_FOR_TARGET" + CONFIGURED_RANLIB_FOR_TARGET="$ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET" fi if test -n "$ncn_target_tool_prefix"; then @@ -4332,71 +4332,71 @@ fi set dummy ${ncn_target_tool_prefix}windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:4335: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then +if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_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. + 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_WINDRES_FOR_TARGET="${ncn_target_tool_prefix}windres" + ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET="${ncn_target_tool_prefix}windres" 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 +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_WINDRES_FOR_TARGET" ; then +if test -z "$ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET" ; then if test $build = $target ; then - ncn_cv_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET + 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:4368: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES_FOR_TARGET'+set}'`\" = set"; then +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 "$ncn_cv_WINDRES_FOR_TARGET"; then - ac_cv_prog_ncn_cv_WINDRES_FOR_TARGET="$ncn_cv_WINDRES_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_ncn_cv_WINDRES_FOR_TARGET="windres" + ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET="windres" break fi done IFS="$ac_save_ifs" - test -z "$ac_cv_prog_ncn_cv_WINDRES_FOR_TARGET" && ac_cv_prog_ncn_cv_WINDRES_FOR_TARGET="windres" + test -z "$ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET="windres" fi fi -ncn_cv_WINDRES_FOR_TARGET="$ac_cv_prog_ncn_cv_WINDRES_FOR_TARGET" -if test -n "$ncn_cv_WINDRES_FOR_TARGET"; then - echo "$ac_t""$ncn_cv_WINDRES_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 - WINDRES_FOR_TARGET=$ncn_cv_WINDRES_FOR_TARGET + CONFIGURED_WINDRES_FOR_TARGET=$ncn_cv_CONFIGURED_WINDRES_FOR_TARGET else - WINDRES_FOR_TARGET="${ncn_target_tool_prefix}windres" + CONFIGURED_WINDRES_FOR_TARGET="${ncn_target_tool_prefix}windres" fi else - WINDRES_FOR_TARGET="$ac_cv_prog_WINDRES_FOR_TARGET" + CONFIGURED_WINDRES_FOR_TARGET="$ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET" fi @@ -4424,14 +4424,31 @@ if test "x${build}" = "x${host}" ; then NM_FOR_TARGET="\$(USUAL_NM_FOR_TARGET)" RANLIB_FOR_TARGET="\$(USUAL_RANLIB_FOR_TARGET)" WINDRES_FOR_TARGET="\$(USUAL_WINDRES_FOR_TARGET)" +else + # 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 + + + + + + + + # Certain tools may need extra flags. 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} echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:4435: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:4452: 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" @@ -4719,20 +4736,20 @@ 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%@AR_FOR_TARGET@%$AR_FOR_TARGET%g -s%@ncn_cv_AR_FOR_TARGET@%$ncn_cv_AR_FOR_TARGET%g -s%@AS_FOR_TARGET@%$AS_FOR_TARGET%g -s%@ncn_cv_AS_FOR_TARGET@%$ncn_cv_AS_FOR_TARGET%g -s%@DLLTOOL_FOR_TARGET@%$DLLTOOL_FOR_TARGET%g -s%@ncn_cv_DLLTOOL_FOR_TARGET@%$ncn_cv_DLLTOOL_FOR_TARGET%g -s%@LD_FOR_TARGET@%$LD_FOR_TARGET%g -s%@ncn_cv_LD_FOR_TARGET@%$ncn_cv_LD_FOR_TARGET%g -s%@NM_FOR_TARGET@%$NM_FOR_TARGET%g -s%@ncn_cv_NM_FOR_TARGET@%$ncn_cv_NM_FOR_TARGET%g -s%@RANLIB_FOR_TARGET@%$RANLIB_FOR_TARGET%g -s%@ncn_cv_RANLIB_FOR_TARGET@%$ncn_cv_RANLIB_FOR_TARGET%g -s%@WINDRES_FOR_TARGET@%$WINDRES_FOR_TARGET%g -s%@ncn_cv_WINDRES_FOR_TARGET@%$ncn_cv_WINDRES_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 @@ -4741,6 +4758,13 @@ 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%@NM_FOR_TARGET@%$NM_FOR_TARGET%g +s%@RANLIB_FOR_TARGET@%$RANLIB_FOR_TARGET%g +s%@WINDRES_FOR_TARGET@%$WINDRES_FOR_TARGET%g s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g diff --git a/configure.in b/configure.in index 0cce5a9..7c8cabc 100644 --- a/configure.in +++ b/configure.in @@ -2045,13 +2045,13 @@ AC_SUBST(DEFAULT_LEX) AC_SUBST(DEFAULT_M4) # Target tools. -NCN_STRICT_CHECK_TARGET_TOOL(AR_FOR_TARGET, ar) -NCN_STRICT_CHECK_TARGET_TOOL(AS_FOR_TARGET, as) -NCN_STRICT_CHECK_TARGET_TOOL(DLLTOOL_FOR_TARGET, dlltool) -NCN_STRICT_CHECK_TARGET_TOOL(LD_FOR_TARGET, ld) -NCN_STRICT_CHECK_TARGET_TOOL(NM_FOR_TARGET, nm) -NCN_STRICT_CHECK_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib, :) -NCN_STRICT_CHECK_TARGET_TOOL(WINDRES_FOR_TARGET, windres) +NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_AR_FOR_TARGET, ar) +NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_AS_FOR_TARGET, as) +NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_DLLTOOL_FOR_TARGET, dlltool) +NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_LD_FOR_TARGET, ld) +NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_NM_FOR_TARGET, nm) +NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_RANLIB_FOR_TARGET, ranlib, :) +NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_WINDRES_FOR_TARGET, windres) AC_SUBST(GCC_FOR_TARGET) AC_SUBST(FLAGS_FOR_TARGET) @@ -2077,7 +2077,24 @@ if test "x${build}" = "x${host}" ; then NM_FOR_TARGET="\$(USUAL_NM_FOR_TARGET)" RANLIB_FOR_TARGET="\$(USUAL_RANLIB_FOR_TARGET)" WINDRES_FOR_TARGET="\$(USUAL_WINDRES_FOR_TARGET)" +else + # 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 +AC_SUBST(AR_FOR_TARGET) +AC_SUBST(AS_FOR_TARGET) +AC_SUBST(DLLTOOL_FOR_TARGET) +AC_SUBST(LD_FOR_TARGET) +AC_SUBST(NM_FOR_TARGET) +AC_SUBST(RANLIB_FOR_TARGET) +AC_SUBST(WINDRES_FOR_TARGET) + # Certain tools may need extra flags. AR_FOR_TARGET=${AR_FOR_TARGET}${extra_arflags_for_target} RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target} -- 2.7.4