* configure.in: Pass a computed --program-transform-name
to subconfigures. * configure: Regenerated.
This commit is contained in:
Daniel Jacobowitz
parent
0487be9a1f
commit
eedd1e14ab
|
|
@ -1,3 +1,9 @@
|
|||
2003-09-21 Daniel Jacobowitz <drow@mvista.com>
|
||||
|
||||
* configure.in: Pass a computed --program-transform-name
|
||||
to subconfigures.
|
||||
* configure: Regenerated.
|
||||
|
||||
2003-09-20 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||
|
||||
* Makefile.tpl: Don't pass down obsolete ENQUIRE variable.
|
||||
|
|
|
|||
|
|
@ -2510,7 +2510,14 @@ serialization_dependencies=serdep.tmp
|
|||
|
||||
# Base args. Strip norecursion, cache-file, srcdir, host, build,
|
||||
# target and nonopt. These are the ones we might not want to pass
|
||||
# down to subconfigures. These will be expanded by make, so quote '$'.
|
||||
# down to subconfigures. Also strip program-prefix, program-suffix,
|
||||
# and program-transform-name, so that we can pass down a consistent
|
||||
# program-transform-name. If autoconf has put single quotes around
|
||||
# any of these arguments (because they contain shell metacharacters)
|
||||
# then this will fail; in practice this only happens for
|
||||
# --program-transform-name, so be sure to override --program-transform-name
|
||||
# at the end of the argument list.
|
||||
# These will be expanded by make, so quote '$'.
|
||||
cat <<\EOF_SED > conftestsed
|
||||
s/ --no[^ ]* / /
|
||||
s/ --c[a-z-]*[= ][^ ]* / /
|
||||
|
|
@ -2518,11 +2525,15 @@ s/ --sr[a-z-]*[= ][^ ]* / /
|
|||
s/ --ho[a-z-]*[= ][^ ]* / /
|
||||
s/ --bu[a-z-]*[= ][^ ]* / /
|
||||
s/ --t[a-z-]*[= ][^ ]* / /
|
||||
s/ --program-[pst][a-z-]*[= ][^ ]* / /
|
||||
s/ -cache-file[= ][^ ]* / /
|
||||
s/ -srcdir[= ][^ ]* / /
|
||||
s/ -host[= ][^ ]* / /
|
||||
s/ -build[= ][^ ]* / /
|
||||
s/ -target[= ][^ ]* / /
|
||||
s/ -program-prefix[= ][^ ]* / /
|
||||
s/ -program-suffix[= ][^ ]* / /
|
||||
s/ -program-transform-name[= ][^ ]* / /
|
||||
s/ [^' -][^ ]* / /
|
||||
s/^ *//;s/ *$//
|
||||
s,\$,$$,g
|
||||
|
|
@ -2533,6 +2544,20 @@ EOF_SED
|
|||
baseargs=`cat conftestsed.out`
|
||||
rm -f conftestsed conftestsed.out
|
||||
|
||||
# Add in --program-transform-name, after --program-prefix and
|
||||
# --program-suffix have been applied to it. Autoconf has already
|
||||
# doubled dollar signs and backslashes in program_transform_name; we want
|
||||
# the backslashes un-doubled, and then the entire thing wrapped in single
|
||||
# quotes, because this will be expanded first by make and then by the shell.
|
||||
# Also, because we want to override the logic in subdir configure scripts to
|
||||
# choose program_transform_name, replace any s,x,x, with s,y,y,.
|
||||
sed -e "s,\\\\\\\\,\\\\,g; s,','\\\\'',g; s/s,x,x,/s,y,y,/" <<EOF_SED > conftestsed.out
|
||||
${program_transform_name}
|
||||
EOF_SED
|
||||
gcc_transform_name=`cat conftestsed.out`
|
||||
rm -f conftestsed.out
|
||||
baseargs="$baseargs --program-transform-name='${gcc_transform_name}'"
|
||||
|
||||
# For the build-side libraries, we just need to pretend we're native,
|
||||
# and not use the same cache file. Multilibs are neither needed nor
|
||||
# desired.
|
||||
|
|
@ -2782,7 +2807,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
|
|||
# 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:2786: checking for $ac_word" >&5
|
||||
echo "configure:2811: 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
|
||||
|
|
@ -2815,7 +2840,7 @@ if test -z "$ac_cv_prog_AR" ; 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:2819: checking for $ac_word" >&5
|
||||
echo "configure:2844: 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
|
||||
|
|
@ -2854,7 +2879,7 @@ fi
|
|||
# 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:2858: checking for $ac_word" >&5
|
||||
echo "configure:2883: 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
|
||||
|
|
@ -2887,7 +2912,7 @@ if test -z "$ac_cv_prog_AS" ; 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:2891: checking for $ac_word" >&5
|
||||
echo "configure:2916: 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
|
||||
|
|
@ -2926,7 +2951,7 @@ fi
|
|||
# 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:2930: checking for $ac_word" >&5
|
||||
echo "configure:2955: 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
|
||||
|
|
@ -2959,7 +2984,7 @@ if test -z "$ac_cv_prog_DLLTOOL" ; 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:2963: checking for $ac_word" >&5
|
||||
echo "configure:2988: 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
|
||||
|
|
@ -2998,7 +3023,7 @@ fi
|
|||
# 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:3002: checking for $ac_word" >&5
|
||||
echo "configure:3027: 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
|
||||
|
|
@ -3031,7 +3056,7 @@ if test -z "$ac_cv_prog_LD" ; 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:3035: checking for $ac_word" >&5
|
||||
echo "configure:3060: 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
|
||||
|
|
@ -3070,7 +3095,7 @@ fi
|
|||
# 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:3074: checking for $ac_word" >&5
|
||||
echo "configure:3099: 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
|
||||
|
|
@ -3103,7 +3128,7 @@ if test -z "$ac_cv_prog_NM" ; 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:3107: checking for $ac_word" >&5
|
||||
echo "configure:3132: 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
|
||||
|
|
@ -3142,7 +3167,7 @@ fi
|
|||
# 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:3146: checking for $ac_word" >&5
|
||||
echo "configure:3171: 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
|
||||
|
|
@ -3175,7 +3200,7 @@ if test -z "$ac_cv_prog_RANLIB" ; 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:3179: checking for $ac_word" >&5
|
||||
echo "configure:3204: 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
|
||||
|
|
@ -3214,7 +3239,7 @@ fi
|
|||
# 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:3218: checking for $ac_word" >&5
|
||||
echo "configure:3243: 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
|
||||
|
|
@ -3247,7 +3272,7 @@ if test -z "$ac_cv_prog_WINDRES" ; 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:3251: checking for $ac_word" >&5
|
||||
echo "configure:3276: 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
|
||||
|
|
@ -3286,7 +3311,7 @@ fi
|
|||
# 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:3290: checking for $ac_word" >&5
|
||||
echo "configure:3315: 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
|
||||
|
|
@ -3319,7 +3344,7 @@ if test -z "$ac_cv_prog_OBJCOPY" ; then
|
|||
# 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:3323: checking for $ac_word" >&5
|
||||
echo "configure:3348: 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
|
||||
|
|
@ -3358,7 +3383,7 @@ fi
|
|||
# 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:3362: checking for $ac_word" >&5
|
||||
echo "configure:3387: 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
|
||||
|
|
@ -3391,7 +3416,7 @@ if test -z "$ac_cv_prog_OBJDUMP" ; 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:3395: checking for $ac_word" >&5
|
||||
echo "configure:3420: 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
|
||||
|
|
@ -3439,7 +3464,7 @@ fi
|
|||
# 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:3443: checking for $ac_word" >&5
|
||||
echo "configure:3468: 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
|
||||
|
|
@ -3472,7 +3497,7 @@ if test -z "$ac_cv_prog_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:3476: checking for $ac_word" >&5
|
||||
echo "configure:3501: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3511,7 +3536,7 @@ fi
|
|||
# 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:3515: checking for $ac_word" >&5
|
||||
echo "configure:3540: 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
|
||||
|
|
@ -3544,7 +3569,7 @@ if test -z "$ac_cv_prog_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:3548: checking for $ac_word" >&5
|
||||
echo "configure:3573: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3583,7 +3608,7 @@ fi
|
|||
# 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:3587: checking for $ac_word" >&5
|
||||
echo "configure:3612: 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
|
||||
|
|
@ -3616,7 +3641,7 @@ if test -z "$ac_cv_prog_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:3620: checking for $ac_word" >&5
|
||||
echo "configure:3645: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3655,7 +3680,7 @@ fi
|
|||
# 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:3659: checking for $ac_word" >&5
|
||||
echo "configure:3684: 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
|
||||
|
|
@ -3688,7 +3713,7 @@ if test -z "$ac_cv_prog_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:3692: checking for $ac_word" >&5
|
||||
echo "configure:3717: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3727,7 +3752,7 @@ fi
|
|||
# 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:3731: checking for $ac_word" >&5
|
||||
echo "configure:3756: 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
|
||||
|
|
@ -3760,7 +3785,7 @@ if test -z "$ac_cv_prog_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:3764: checking for $ac_word" >&5
|
||||
echo "configure:3789: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3799,7 +3824,7 @@ fi
|
|||
# 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:3803: checking for $ac_word" >&5
|
||||
echo "configure:3828: 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
|
||||
|
|
@ -3832,7 +3857,7 @@ if test -z "$ac_cv_prog_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:3836: checking for $ac_word" >&5
|
||||
echo "configure:3861: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3871,7 +3896,7 @@ fi
|
|||
# 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:3875: checking for $ac_word" >&5
|
||||
echo "configure:3900: 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
|
||||
|
|
@ -3904,7 +3929,7 @@ if test -z "$ac_cv_prog_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:3908: checking for $ac_word" >&5
|
||||
echo "configure:3933: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3971,7 +3996,7 @@ 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:3975: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
echo "configure:4000: 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"
|
||||
|
|
|
|||
27
configure.in
27
configure.in
|
|
@ -1760,7 +1760,14 @@ AC_SUBST_FILE(serialization_dependencies)
|
|||
|
||||
# Base args. Strip norecursion, cache-file, srcdir, host, build,
|
||||
# target and nonopt. These are the ones we might not want to pass
|
||||
# down to subconfigures. These will be expanded by make, so quote '$'.
|
||||
# down to subconfigures. Also strip program-prefix, program-suffix,
|
||||
# and program-transform-name, so that we can pass down a consistent
|
||||
# program-transform-name. If autoconf has put single quotes around
|
||||
# any of these arguments (because they contain shell metacharacters)
|
||||
# then this will fail; in practice this only happens for
|
||||
# --program-transform-name, so be sure to override --program-transform-name
|
||||
# at the end of the argument list.
|
||||
# These will be expanded by make, so quote '$'.
|
||||
cat <<\EOF_SED > conftestsed
|
||||
s/ --no[[^ ]]* / /
|
||||
s/ --c[[a-z-]]*[[= ]][[^ ]]* / /
|
||||
|
|
@ -1768,11 +1775,15 @@ s/ --sr[[a-z-]]*[[= ]][[^ ]]* / /
|
|||
s/ --ho[[a-z-]]*[[= ]][[^ ]]* / /
|
||||
s/ --bu[[a-z-]]*[[= ]][[^ ]]* / /
|
||||
s/ --t[[a-z-]]*[[= ]][[^ ]]* / /
|
||||
s/ --program-[[pst]][[a-z-]]*[[= ]][[^ ]]* / /
|
||||
s/ -cache-file[[= ]][[^ ]]* / /
|
||||
s/ -srcdir[[= ]][[^ ]]* / /
|
||||
s/ -host[[= ]][[^ ]]* / /
|
||||
s/ -build[[= ]][[^ ]]* / /
|
||||
s/ -target[[= ]][[^ ]]* / /
|
||||
s/ -program-prefix[[= ]][[^ ]]* / /
|
||||
s/ -program-suffix[[= ]][[^ ]]* / /
|
||||
s/ -program-transform-name[[= ]][[^ ]]* / /
|
||||
s/ [[^' -][^ ]*] / /
|
||||
s/^ *//;s/ *$//
|
||||
s,\$,$$,g
|
||||
|
|
@ -1783,6 +1794,20 @@ EOF_SED
|
|||
baseargs=`cat conftestsed.out`
|
||||
rm -f conftestsed conftestsed.out
|
||||
|
||||
# Add in --program-transform-name, after --program-prefix and
|
||||
# --program-suffix have been applied to it. Autoconf has already
|
||||
# doubled dollar signs and backslashes in program_transform_name; we want
|
||||
# the backslashes un-doubled, and then the entire thing wrapped in single
|
||||
# quotes, because this will be expanded first by make and then by the shell.
|
||||
# Also, because we want to override the logic in subdir configure scripts to
|
||||
# choose program_transform_name, replace any s,x,x, with s,y,y,.
|
||||
sed -e "s,\\\\\\\\,\\\\,g; s,','\\\\'',g; s/s,x,x,/s,y,y,/" <<EOF_SED > conftestsed.out
|
||||
${program_transform_name}
|
||||
EOF_SED
|
||||
gcc_transform_name=`cat conftestsed.out`
|
||||
rm -f conftestsed.out
|
||||
baseargs="$baseargs --program-transform-name='${gcc_transform_name}'"
|
||||
|
||||
# For the build-side libraries, we just need to pretend we're native,
|
||||
# and not use the same cache file. Multilibs are neither needed nor
|
||||
# desired.
|
||||
|
|
|
|||
Loading…
Reference in New Issue