configure.in: Clean up config-lang.in handling.
* configure.in: Clean up config-lang.in handling. Delete useless assignment to "subdirs". * configure: Regenerate. From-SVN: r68588
This commit is contained in:
Nathanael Nerode
parent
3006aa689d
commit
07d1940e1c
@ -1,3 +1,9 @@
|
||||
2003-06-27 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||
|
||||
* configure.in: Clean up config-lang.in handling. Delete
|
||||
useless assignment to "subdirs".
|
||||
* configure: Regenerate.
|
||||
|
||||
2003-06-26 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||
|
||||
* configure.in: Rename 'target_libs' to 'target_libraries'.
|
||||
|
||||
135
configure
vendored
135
configure
vendored
@ -1441,24 +1441,24 @@ enable_languages=`echo "${enable_languages}" | sed -e 's/[ ,][ ,]*/,/g' -e 's/
|
||||
# First scan to see if an enabled language requires some other language.
|
||||
# We assume that a given config-lang.in will list all the language
|
||||
# front ends it requires, even if some are required indirectly.
|
||||
for lang in ${srcdir}/gcc/*/config-lang.in ..
|
||||
do
|
||||
case $lang in
|
||||
for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
|
||||
case ${lang_frag} in
|
||||
..) ;;
|
||||
# The odd quoting in the next line works around
|
||||
# an apparent bug in bash 1.12 on linux.
|
||||
${srcdir}/gcc/[*]/config-lang.in) ;;
|
||||
*)
|
||||
lang_alias=`sed -n -e 's,^language=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^language=\([^ ]*\).*$,\1,p' $lang`
|
||||
this_lang_requires=`sed -n -e 's,^lang_requires=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^lang_requires=\([^ ]*\).*$,\1,p' $lang`
|
||||
for other in $this_lang_requires
|
||||
do
|
||||
# From the config-lang.in, get $language, $lang_requires
|
||||
language=
|
||||
lang_requires=
|
||||
. ${lang_frag}
|
||||
for other in ${lang_requires} ; do
|
||||
case ,${enable_languages}, in
|
||||
*,$other,*) ;;
|
||||
*,all,*) ;;
|
||||
*,$lang_alias,*)
|
||||
echo " \`$other' language required by \`$lang_alias'; enabling" 1>&2
|
||||
enable_languages="$enable_languages,$other"
|
||||
*,$language,*)
|
||||
echo " \`$other' language required by \`$language'; enabling" 1>&2
|
||||
enable_languages="${enable_languages},${other}"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
@ -1466,35 +1466,44 @@ do
|
||||
esac
|
||||
done
|
||||
|
||||
subdirs=
|
||||
for lang in ${srcdir}/gcc/*/config-lang.in ..
|
||||
do
|
||||
case $lang in
|
||||
for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
|
||||
case ${lang_frag} in
|
||||
..) ;;
|
||||
# The odd quoting in the next line works around
|
||||
# an apparent bug in bash 1.12 on linux.
|
||||
${srcdir}/gcc/[*]/config-lang.in) ;;
|
||||
*)
|
||||
lang_alias=`sed -n -e 's,^language=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^language=\([^ ]*\).*$,\1,p' $lang`
|
||||
this_lang_libs=`sed -n -e 's,^target_libs=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^target_libs=\([^ ]*\).*$,\1,p' $lang`
|
||||
this_lang_dirs=`sed -n -e 's,^lang_dirs=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^lang_dirs=\([^ ]*\).*$,\1,p' $lang`
|
||||
build_by_default=`sed -n -e 's,^build_by_default=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^build_by_default=\([^ ]*\).*$,\1,p' $lang`
|
||||
if test "x$lang_alias" = x
|
||||
then
|
||||
echo "$lang doesn't set \$language." 1>&2
|
||||
# From the config-lang.in, get $language, $target_libs,
|
||||
# $lang_dirs, and $build_by_default
|
||||
language=
|
||||
target_libs=
|
||||
lang_dirs=
|
||||
build_by_default=
|
||||
. ${lang_frag}
|
||||
if test "x$language" = x ; then
|
||||
echo "${lang_frag} doesn't set \$language." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
case ${build_by_default},${enable_languages}, in
|
||||
*,$lang_alias,*) add_this_lang=yes ;;
|
||||
no,*) add_this_lang=no ;;
|
||||
*,all,*) add_this_lang=yes ;;
|
||||
case ,${enable_languages}, in
|
||||
*,${language},*)
|
||||
# Language was explicitly selected; include it.
|
||||
add_this_lang=yes
|
||||
;;
|
||||
*,all,*)
|
||||
# 'all' was selected; include 'default' languages.
|
||||
case ${build_by_default} in
|
||||
no) add_this_lang=no ;;
|
||||
*) add_this_lang=yes ;;
|
||||
esac
|
||||
;;
|
||||
*) add_this_lang=no ;;
|
||||
esac
|
||||
if test x"${add_this_lang}" = xyes; then
|
||||
:
|
||||
else
|
||||
eval noconfigdirs='"$noconfigdirs "'\"$this_lang_libs $this_lang_dirs\"
|
||||
fi
|
||||
case ${add_this_lang} in
|
||||
no)
|
||||
# Remove language-dependent dirs.
|
||||
eval noconfigdirs='"$noconfigdirs "'\"$target_libs $lang_dirs\"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
done
|
||||
@ -2699,7 +2708,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:2703: checking for $ac_word" >&5
|
||||
echo "configure:2712: 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
|
||||
@ -2732,7 +2741,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:2736: checking for $ac_word" >&5
|
||||
echo "configure:2745: 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
|
||||
@ -2771,7 +2780,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:2775: checking for $ac_word" >&5
|
||||
echo "configure:2784: 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
|
||||
@ -2804,7 +2813,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:2808: checking for $ac_word" >&5
|
||||
echo "configure:2817: 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
|
||||
@ -2843,7 +2852,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:2847: checking for $ac_word" >&5
|
||||
echo "configure:2856: 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
|
||||
@ -2876,7 +2885,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:2880: checking for $ac_word" >&5
|
||||
echo "configure:2889: 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
|
||||
@ -2915,7 +2924,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:2919: checking for $ac_word" >&5
|
||||
echo "configure:2928: 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
|
||||
@ -2948,7 +2957,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:2952: checking for $ac_word" >&5
|
||||
echo "configure:2961: 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
|
||||
@ -2987,7 +2996,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:2991: checking for $ac_word" >&5
|
||||
echo "configure:3000: 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
|
||||
@ -3020,7 +3029,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:3024: checking for $ac_word" >&5
|
||||
echo "configure:3033: 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
|
||||
@ -3059,7 +3068,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:3063: checking for $ac_word" >&5
|
||||
echo "configure:3072: 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
|
||||
@ -3092,7 +3101,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:3096: checking for $ac_word" >&5
|
||||
echo "configure:3105: 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
|
||||
@ -3131,7 +3140,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:3135: checking for $ac_word" >&5
|
||||
echo "configure:3144: 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
|
||||
@ -3164,7 +3173,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:3168: checking for $ac_word" >&5
|
||||
echo "configure:3177: 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
|
||||
@ -3203,7 +3212,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:3207: checking for $ac_word" >&5
|
||||
echo "configure:3216: 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
|
||||
@ -3236,7 +3245,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:3240: checking for $ac_word" >&5
|
||||
echo "configure:3249: 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
|
||||
@ -3275,7 +3284,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:3279: checking for $ac_word" >&5
|
||||
echo "configure:3288: 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
|
||||
@ -3308,7 +3317,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:3312: checking for $ac_word" >&5
|
||||
echo "configure:3321: 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
|
||||
@ -3356,7 +3365,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:3360: checking for $ac_word" >&5
|
||||
echo "configure:3369: 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
|
||||
@ -3389,7 +3398,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:3393: checking for $ac_word" >&5
|
||||
echo "configure:3402: 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
|
||||
@ -3428,7 +3437,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:3432: checking for $ac_word" >&5
|
||||
echo "configure:3441: 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
|
||||
@ -3461,7 +3470,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:3465: checking for $ac_word" >&5
|
||||
echo "configure:3474: 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
|
||||
@ -3500,7 +3509,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:3504: checking for $ac_word" >&5
|
||||
echo "configure:3513: 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
|
||||
@ -3533,7 +3542,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:3537: checking for $ac_word" >&5
|
||||
echo "configure:3546: 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
|
||||
@ -3572,7 +3581,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:3576: checking for $ac_word" >&5
|
||||
echo "configure:3585: 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
|
||||
@ -3605,7 +3614,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:3609: checking for $ac_word" >&5
|
||||
echo "configure:3618: 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
|
||||
@ -3644,7 +3653,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:3648: checking for $ac_word" >&5
|
||||
echo "configure:3657: 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
|
||||
@ -3677,7 +3686,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:3681: checking for $ac_word" >&5
|
||||
echo "configure:3690: 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
|
||||
@ -3716,7 +3725,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:3720: checking for $ac_word" >&5
|
||||
echo "configure:3729: 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
|
||||
@ -3749,7 +3758,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:3753: checking for $ac_word" >&5
|
||||
echo "configure:3762: 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
|
||||
@ -3788,7 +3797,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:3792: checking for $ac_word" >&5
|
||||
echo "configure:3801: 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
|
||||
@ -3821,7 +3830,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:3825: checking for $ac_word" >&5
|
||||
echo "configure:3834: 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
|
||||
@ -3888,7 +3897,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:3892: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
echo "configure:3901: 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"
|
||||
|
||||
69
configure.in
69
configure.in
@ -755,24 +755,24 @@ enable_languages=`echo "${enable_languages}" | sed -e 's/[[ ,]][[ ,]]*/,/g' -e
|
||||
# First scan to see if an enabled language requires some other language.
|
||||
# We assume that a given config-lang.in will list all the language
|
||||
# front ends it requires, even if some are required indirectly.
|
||||
for lang in ${srcdir}/gcc/*/config-lang.in ..
|
||||
do
|
||||
case $lang in
|
||||
for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
|
||||
case ${lang_frag} in
|
||||
..) ;;
|
||||
# The odd quoting in the next line works around
|
||||
# an apparent bug in bash 1.12 on linux.
|
||||
${srcdir}/gcc/[[*]]/config-lang.in) ;;
|
||||
*)
|
||||
lang_alias=`sed -n -e 's,^language=[['"'"'"'"]]\(.*\)[["'"'"'"']].*$,\1,p' -e 's,^language=\([[^ ]]*\).*$,\1,p' $lang`
|
||||
this_lang_requires=`sed -n -e 's,^lang_requires=[['"'"'"'"]]\(.*\)[["'"'"'"']].*$,\1,p' -e 's,^lang_requires=\([[^ ]]*\).*$,\1,p' $lang`
|
||||
for other in $this_lang_requires
|
||||
do
|
||||
# From the config-lang.in, get $language, $lang_requires
|
||||
language=
|
||||
lang_requires=
|
||||
. ${lang_frag}
|
||||
for other in ${lang_requires} ; do
|
||||
case ,${enable_languages}, in
|
||||
*,$other,*) ;;
|
||||
*,all,*) ;;
|
||||
*,$lang_alias,*)
|
||||
echo " \`$other' language required by \`$lang_alias'; enabling" 1>&2
|
||||
enable_languages="$enable_languages,$other"
|
||||
*,$language,*)
|
||||
echo " \`$other' language required by \`$language'; enabling" 1>&2
|
||||
enable_languages="${enable_languages},${other}"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
@ -780,35 +780,44 @@ do
|
||||
esac
|
||||
done
|
||||
|
||||
subdirs=
|
||||
for lang in ${srcdir}/gcc/*/config-lang.in ..
|
||||
do
|
||||
case $lang in
|
||||
for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
|
||||
case ${lang_frag} in
|
||||
..) ;;
|
||||
# The odd quoting in the next line works around
|
||||
# an apparent bug in bash 1.12 on linux.
|
||||
${srcdir}/gcc/[[*]]/config-lang.in) ;;
|
||||
*)
|
||||
lang_alias=`sed -n -e 's,^language=[['"'"'"'"]]\(.*\)[["'"'"'"']].*$,\1,p' -e 's,^language=\([[^ ]]*\).*$,\1,p' $lang`
|
||||
this_lang_libs=`sed -n -e 's,^target_libs=[['"'"'"'"]]\(.*\)[["'"'"'"']].*$,\1,p' -e 's,^target_libs=\([[^ ]]*\).*$,\1,p' $lang`
|
||||
this_lang_dirs=`sed -n -e 's,^lang_dirs=[['"'"'"'"]]\(.*\)[["'"'"'"']].*$,\1,p' -e 's,^lang_dirs=\([[^ ]]*\).*$,\1,p' $lang`
|
||||
build_by_default=`sed -n -e 's,^build_by_default=[['"'"'"'"]]\(.*\)[["'"'"'"']].*$,\1,p' -e 's,^build_by_default=\([[^ ]]*\).*$,\1,p' $lang`
|
||||
if test "x$lang_alias" = x
|
||||
then
|
||||
echo "$lang doesn't set \$language." 1>&2
|
||||
# From the config-lang.in, get $language, $target_libs,
|
||||
# $lang_dirs, and $build_by_default
|
||||
language=
|
||||
target_libs=
|
||||
lang_dirs=
|
||||
build_by_default=
|
||||
. ${lang_frag}
|
||||
if test "x$language" = x ; then
|
||||
echo "${lang_frag} doesn't set \$language." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
case ${build_by_default},${enable_languages}, in
|
||||
*,$lang_alias,*) add_this_lang=yes ;;
|
||||
no,*) add_this_lang=no ;;
|
||||
*,all,*) add_this_lang=yes ;;
|
||||
case ,${enable_languages}, in
|
||||
*,${language},*)
|
||||
# Language was explicitly selected; include it.
|
||||
add_this_lang=yes
|
||||
;;
|
||||
*,all,*)
|
||||
# 'all' was selected; include 'default' languages.
|
||||
case ${build_by_default} in
|
||||
no) add_this_lang=no ;;
|
||||
*) add_this_lang=yes ;;
|
||||
esac
|
||||
;;
|
||||
*) add_this_lang=no ;;
|
||||
esac
|
||||
if test x"${add_this_lang}" = xyes; then
|
||||
:
|
||||
else
|
||||
eval noconfigdirs='"$noconfigdirs "'\"$this_lang_libs $this_lang_dirs\"
|
||||
fi
|
||||
case ${add_this_lang} in
|
||||
no)
|
||||
# Remove language-dependent dirs.
|
||||
eval noconfigdirs='"$noconfigdirs "'\"$target_libs $lang_dirs\"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
Loading…
Reference in New Issue
Block a user