* configure.in: Fix --enable-bootstrap breakage introduced in trees without
gcc. * configure: Regenerate.
This commit is contained in:
Christopher Faylor
parent
b7e784a7f2
commit
498d4a7155
@ -1,3 +1,9 @@
|
||||
2004-06-03 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* configure.in: Fix --enable-bootstrap breakage introduced in trees
|
||||
without gcc.
|
||||
* configure: Regenerate.
|
||||
|
||||
2004-06-01 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* Makefile.tpl: Fix typo.
|
||||
|
||||
144
configure
vendored
144
configure
vendored
@ -3050,37 +3050,6 @@ esac
|
||||
# to maintain later. In this particular case, you just have to be careful
|
||||
# not to nest @if/@endif pairs, because configure will not warn you at all.
|
||||
|
||||
for module in ${build_modules} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
&& test -f ${build_subdir}/${module}/Makefile; then
|
||||
echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
|
||||
rm -f ${build_subdir}/${module}/Makefile
|
||||
fi
|
||||
extrasub="$extrasub
|
||||
/^@if build-$module\$/d
|
||||
/^@endif build-$module\$/d"
|
||||
done
|
||||
for module in ${configdirs} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
&& test -f ${module}/Makefile; then
|
||||
echo 1>&2 "*** removing ${module}/Makefile to force reconfigure"
|
||||
rm -f ${module}/Makefile
|
||||
fi
|
||||
extrasub="$extrasub
|
||||
/^@if $module\$/d
|
||||
/^@endif $module\$/d"
|
||||
done
|
||||
for module in ${target_configdirs} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
&& test -f ${target_subdir}/${module}/Makefile; then
|
||||
echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
|
||||
rm -f ${target_subdir}/${module}/Makefile
|
||||
fi
|
||||
extrasub="$extrasub
|
||||
/^@if target-$module\$/d
|
||||
/^@endif target-$module\$/d"
|
||||
done
|
||||
|
||||
# Check whether --enable-bootstrap or --disable-bootstrap was given.
|
||||
if test "${enable_bootstrap+set}" = set; then
|
||||
enableval="$enable_bootstrap"
|
||||
@ -3104,17 +3073,50 @@ fi
|
||||
case "$enable_bootstrap" in
|
||||
yes)
|
||||
default_target=bootstrap
|
||||
extrasub="$extrasub
|
||||
/^@if gcc-bootstrap\$/d
|
||||
/^@endif gcc-bootstrap\$/d" ;;
|
||||
bootstrap_suffix=bootstrap ;;
|
||||
no)
|
||||
default_target=all
|
||||
extrasub="$extrasub
|
||||
/^@if gcc-no-bootstrap\$/d
|
||||
/^@endif gcc-no-bootstrap\$/d" ;;
|
||||
bootstrap_suffix=no-bootstrap ;;
|
||||
esac
|
||||
|
||||
|
||||
for module in ${build_modules} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
&& test -f ${build_subdir}/${module}/Makefile; then
|
||||
echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
|
||||
rm -f ${build_subdir}/${module}/Makefile
|
||||
fi
|
||||
extrasub="$extrasub
|
||||
/^@if build-$module\$/d
|
||||
/^@endif build-$module\$/d
|
||||
/^@if build-$module-$bootstrap_suffix\$/d
|
||||
/^@endif build-$module-$bootstrap_suffix\$/d"
|
||||
done
|
||||
for module in ${configdirs} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
&& test -f ${module}/Makefile; then
|
||||
echo 1>&2 "*** removing ${module}/Makefile to force reconfigure"
|
||||
rm -f ${module}/Makefile
|
||||
fi
|
||||
extrasub="$extrasub
|
||||
/^@if $module\$/d
|
||||
/^@endif $module\$/d
|
||||
/^@if $module-$bootstrap_suffix\$/d
|
||||
/^@endif $module-$bootstrap_suffix\$/d"
|
||||
done
|
||||
for module in ${target_configdirs} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
&& test -f ${target_subdir}/${module}/Makefile; then
|
||||
echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
|
||||
rm -f ${target_subdir}/${module}/Makefile
|
||||
fi
|
||||
extrasub="$extrasub
|
||||
/^@if target-$module\$/d
|
||||
/^@endif target-$module\$/d
|
||||
/^@if target-$module-$bootstrap_suffix\$/d
|
||||
/^@endif target-$module-$bootstrap_suffix\$/d"
|
||||
done
|
||||
|
||||
extrasub="$extrasub
|
||||
/^@if /,/^@endif /d"
|
||||
|
||||
@ -3497,7 +3499,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:3501: checking for $ac_word" >&5
|
||||
echo "configure:3503: 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
|
||||
@ -3530,7 +3532,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:3534: checking for $ac_word" >&5
|
||||
echo "configure:3536: 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
|
||||
@ -3569,7 +3571,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:3573: checking for $ac_word" >&5
|
||||
echo "configure:3575: 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
|
||||
@ -3602,7 +3604,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:3606: checking for $ac_word" >&5
|
||||
echo "configure:3608: 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
|
||||
@ -3641,7 +3643,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:3645: checking for $ac_word" >&5
|
||||
echo "configure:3647: 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
|
||||
@ -3674,7 +3676,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:3678: checking for $ac_word" >&5
|
||||
echo "configure:3680: 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
|
||||
@ -3713,7 +3715,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:3717: checking for $ac_word" >&5
|
||||
echo "configure:3719: 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
|
||||
@ -3746,7 +3748,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:3750: checking for $ac_word" >&5
|
||||
echo "configure:3752: 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
|
||||
@ -3785,7 +3787,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:3789: checking for $ac_word" >&5
|
||||
echo "configure:3791: 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
|
||||
@ -3818,7 +3820,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:3822: checking for $ac_word" >&5
|
||||
echo "configure:3824: 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
|
||||
@ -3857,7 +3859,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:3861: checking for $ac_word" >&5
|
||||
echo "configure:3863: 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
|
||||
@ -3890,7 +3892,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:3894: checking for $ac_word" >&5
|
||||
echo "configure:3896: 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
|
||||
@ -3929,7 +3931,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:3933: checking for $ac_word" >&5
|
||||
echo "configure:3935: 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
|
||||
@ -3962,7 +3964,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:3966: checking for $ac_word" >&5
|
||||
echo "configure:3968: 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
|
||||
@ -4001,7 +4003,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:4005: checking for $ac_word" >&5
|
||||
echo "configure:4007: 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
|
||||
@ -4034,7 +4036,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:4038: checking for $ac_word" >&5
|
||||
echo "configure:4040: 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
|
||||
@ -4073,7 +4075,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:4077: checking for $ac_word" >&5
|
||||
echo "configure:4079: 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
|
||||
@ -4106,7 +4108,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:4110: checking for $ac_word" >&5
|
||||
echo "configure:4112: 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
|
||||
@ -4155,7 +4157,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:4159: checking for $ac_word" >&5
|
||||
echo "configure:4161: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4188,7 +4190,7 @@ if test -z "$ac_cv_prog_CONFIGURED_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:4192: checking for $ac_word" >&5
|
||||
echo "configure:4194: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4227,7 +4229,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:4231: checking for $ac_word" >&5
|
||||
echo "configure:4233: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4260,7 +4262,7 @@ if test -z "$ac_cv_prog_CONFIGURED_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:4264: checking for $ac_word" >&5
|
||||
echo "configure:4266: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4299,7 +4301,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:4303: checking for $ac_word" >&5
|
||||
echo "configure:4305: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4332,7 +4334,7 @@ if test -z "$ac_cv_prog_CONFIGURED_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:4336: checking for $ac_word" >&5
|
||||
echo "configure:4338: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4371,7 +4373,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:4375: checking for $ac_word" >&5
|
||||
echo "configure:4377: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4404,7 +4406,7 @@ if test -z "$ac_cv_prog_CONFIGURED_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:4408: checking for $ac_word" >&5
|
||||
echo "configure:4410: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4443,7 +4445,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:4447: checking for $ac_word" >&5
|
||||
echo "configure:4449: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4476,7 +4478,7 @@ if test -z "$ac_cv_prog_CONFIGURED_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:4480: checking for $ac_word" >&5
|
||||
echo "configure:4482: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4515,7 +4517,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:4519: checking for $ac_word" >&5
|
||||
echo "configure:4521: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4548,7 +4550,7 @@ if test -z "$ac_cv_prog_CONFIGURED_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:4552: checking for $ac_word" >&5
|
||||
echo "configure:4554: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4587,7 +4589,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:4591: checking for $ac_word" >&5
|
||||
echo "configure:4593: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4620,7 +4622,7 @@ if test -z "$ac_cv_prog_CONFIGURED_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:4624: checking for $ac_word" >&5
|
||||
echo "configure:4626: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -4705,7 +4707,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:4709: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
echo "configure:4711: 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"
|
||||
@ -4752,7 +4754,7 @@ esac
|
||||
# gcc for stageN-gcc and stage-prev for stage(N-1). In case this is not
|
||||
# possible, however, we can resort to mv.
|
||||
echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6
|
||||
echo "configure:4756: checking if symbolic links between directories work" >&5
|
||||
echo "configure:4758: checking if symbolic links between directories work" >&5
|
||||
if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
76
configure.in
76
configure.in
@ -1730,37 +1730,6 @@ esac
|
||||
# to maintain later. In this particular case, you just have to be careful
|
||||
# not to nest @if/@endif pairs, because configure will not warn you at all.
|
||||
|
||||
for module in ${build_modules} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
&& test -f ${build_subdir}/${module}/Makefile; then
|
||||
echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
|
||||
rm -f ${build_subdir}/${module}/Makefile
|
||||
fi
|
||||
extrasub="$extrasub
|
||||
/^@if build-$module\$/d
|
||||
/^@endif build-$module\$/d"
|
||||
done
|
||||
for module in ${configdirs} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
&& test -f ${module}/Makefile; then
|
||||
echo 1>&2 "*** removing ${module}/Makefile to force reconfigure"
|
||||
rm -f ${module}/Makefile
|
||||
fi
|
||||
extrasub="$extrasub
|
||||
/^@if $module\$/d
|
||||
/^@endif $module\$/d"
|
||||
done
|
||||
for module in ${target_configdirs} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
&& test -f ${target_subdir}/${module}/Makefile; then
|
||||
echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
|
||||
rm -f ${target_subdir}/${module}/Makefile
|
||||
fi
|
||||
extrasub="$extrasub
|
||||
/^@if target-$module\$/d
|
||||
/^@endif target-$module\$/d"
|
||||
done
|
||||
|
||||
AC_ARG_ENABLE([bootstrap],
|
||||
[ --enable-bootstrap Enable bootstrapping [no]],,
|
||||
enable_bootstrap=no)
|
||||
@ -1779,17 +1748,50 @@ fi
|
||||
case "$enable_bootstrap" in
|
||||
yes)
|
||||
default_target=bootstrap
|
||||
extrasub="$extrasub
|
||||
/^@if gcc-bootstrap\$/d
|
||||
/^@endif gcc-bootstrap\$/d" ;;
|
||||
bootstrap_suffix=bootstrap ;;
|
||||
no)
|
||||
default_target=all
|
||||
extrasub="$extrasub
|
||||
/^@if gcc-no-bootstrap\$/d
|
||||
/^@endif gcc-no-bootstrap\$/d" ;;
|
||||
bootstrap_suffix=no-bootstrap ;;
|
||||
esac
|
||||
AC_SUBST(default_target)
|
||||
|
||||
for module in ${build_modules} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
&& test -f ${build_subdir}/${module}/Makefile; then
|
||||
echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
|
||||
rm -f ${build_subdir}/${module}/Makefile
|
||||
fi
|
||||
extrasub="$extrasub
|
||||
/^@if build-$module\$/d
|
||||
/^@endif build-$module\$/d
|
||||
/^@if build-$module-$bootstrap_suffix\$/d
|
||||
/^@endif build-$module-$bootstrap_suffix\$/d"
|
||||
done
|
||||
for module in ${configdirs} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
&& test -f ${module}/Makefile; then
|
||||
echo 1>&2 "*** removing ${module}/Makefile to force reconfigure"
|
||||
rm -f ${module}/Makefile
|
||||
fi
|
||||
extrasub="$extrasub
|
||||
/^@if $module\$/d
|
||||
/^@endif $module\$/d
|
||||
/^@if $module-$bootstrap_suffix\$/d
|
||||
/^@endif $module-$bootstrap_suffix\$/d"
|
||||
done
|
||||
for module in ${target_configdirs} ; do
|
||||
if test -z "${no_recursion}" \
|
||||
&& test -f ${target_subdir}/${module}/Makefile; then
|
||||
echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
|
||||
rm -f ${target_subdir}/${module}/Makefile
|
||||
fi
|
||||
extrasub="$extrasub
|
||||
/^@if target-$module\$/d
|
||||
/^@endif target-$module\$/d
|
||||
/^@if target-$module-$bootstrap_suffix\$/d
|
||||
/^@endif target-$module-$bootstrap_suffix\$/d"
|
||||
done
|
||||
|
||||
extrasub="$extrasub
|
||||
/^@if /,/^@endif /d"
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user