Merge configure.in, configure with GCC.
This commit is contained in:
Geoffrey Keating
parent
0b10f795f1
commit
d41ac477ee
12
ChangeLog
12
ChangeLog
|
|
@ -1,3 +1,15 @@
|
|||
2003-08-20 Geoffrey Keating <geoffk@apple.com>
|
||||
|
||||
PR 8180
|
||||
* configure.in: When testing with_libs and with_headers, treat
|
||||
'no' as unset. Based on a patch by Dan Kegel <dank@kegel.com>.
|
||||
* configure: Regenerate.
|
||||
|
||||
* configure.in (TOPLEVEL_CONFIGURE_ARGUMENTS): Quote properly for
|
||||
make, shell, etc.
|
||||
(baseargs): Likewise.
|
||||
* configure: Regenerate.
|
||||
|
||||
2003-08-19 Geoffrey Keating <geoffk@apple.com>
|
||||
|
||||
* configure.in: Disable libgcj for darwin not on powerpc.
|
||||
|
|
|
|||
|
|
@ -794,8 +794,19 @@ progname=$0
|
|||
# if PWD already has a value, it is probably wrong.
|
||||
if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi
|
||||
|
||||
# Export original configure arguments for use by sub-configures.
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS="$progname $@"
|
||||
# Export original configure arguments for use by sub-configures. These
|
||||
# will be expanded once by make, and once by the shell, so they need to
|
||||
# have '$' quoted for make, and then each argument quoted for the shell.
|
||||
# What's more, the 'echo' below might expand backslashes.
|
||||
cat <<\EOF_SED > conftestsed
|
||||
s,\\,\\\\,g; s,\$,$$,g
|
||||
EOF_SED
|
||||
tmp="'$progname'"
|
||||
for ac_arg ; do
|
||||
tmp="$tmp '"`echo "$ac_arg" | sed -fconftestsed`
|
||||
done
|
||||
rm -f conftestsed
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS="$tmp"
|
||||
|
||||
|
||||
moveifchange=${srcdir}/move-if-change
|
||||
|
|
@ -2504,20 +2515,24 @@ 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.
|
||||
baseargs=`echo " ${ac_configure_args} " | \
|
||||
sed -e 's/ --no[^ ]* / /' \
|
||||
-e 's/ --c[a-z-]*[= ][^ ]* / /' \
|
||||
-e 's/ --sr[a-z-]*[= ][^ ]* / /' \
|
||||
-e 's/ --ho[a-z-]*[= ][^ ]* / /' \
|
||||
-e 's/ --bu[a-z-]*[= ][^ ]* / /' \
|
||||
-e 's/ --t[a-z-]*[= ][^ ]* / /' \
|
||||
-e 's/ -cache-file[= ][^ ]* / /' \
|
||||
-e 's/ -srcdir[= ][^ ]* / /' \
|
||||
-e 's/ -host[= ][^ ]* / /' \
|
||||
-e 's/ -build[= ][^ ]* / /' \
|
||||
-e 's/ -target[= ][^ ]* / /' \
|
||||
-e "s/ [^' -][^ ]* / /" \
|
||||
-e 's/^ *//;s/ *$//'`
|
||||
cat <<\EOF_SED > conftestsed
|
||||
s/ --no[^ ]* / /
|
||||
s/ --c[a-z-]*[= ][^ ]* / /
|
||||
s/ --sr[a-z-]*[= ][^ ]* / /
|
||||
s/ --ho[a-z-]*[= ][^ ]* / /
|
||||
s/ --bu[a-z-]*[= ][^ ]* / /
|
||||
s/ --t[a-z-]*[= ][^ ]* / /
|
||||
s/ -cache-file[= ][^ ]* / /
|
||||
s/ -srcdir[= ][^ ]* / /
|
||||
s/ -host[= ][^ ]* / /
|
||||
s/ -build[= ][^ ]* / /
|
||||
s/ -target[= ][^ ]* / /
|
||||
s/ [^' -][^ ]* / /
|
||||
s/^ *//;s/ *$//
|
||||
s,\\,\\\\,g; s,\$,$$,g
|
||||
EOF_SED
|
||||
baseargs=`echo " ${ac_configure_args} " | sed -fconftestsed`
|
||||
rm -f conftestsed
|
||||
|
||||
# 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
|
||||
|
|
@ -2766,7 +2781,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:2770: checking for $ac_word" >&5
|
||||
echo "configure:2785: 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
|
||||
|
|
@ -2799,7 +2814,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:2803: checking for $ac_word" >&5
|
||||
echo "configure:2818: 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
|
||||
|
|
@ -2838,7 +2853,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:2842: checking for $ac_word" >&5
|
||||
echo "configure:2857: 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
|
||||
|
|
@ -2871,7 +2886,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:2875: checking for $ac_word" >&5
|
||||
echo "configure:2890: 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
|
||||
|
|
@ -2910,7 +2925,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:2914: checking for $ac_word" >&5
|
||||
echo "configure:2929: 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
|
||||
|
|
@ -2943,7 +2958,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:2947: checking for $ac_word" >&5
|
||||
echo "configure:2962: 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
|
||||
|
|
@ -2982,7 +2997,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:2986: checking for $ac_word" >&5
|
||||
echo "configure:3001: 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
|
||||
|
|
@ -3015,7 +3030,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:3019: checking for $ac_word" >&5
|
||||
echo "configure:3034: 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
|
||||
|
|
@ -3054,7 +3069,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:3058: checking for $ac_word" >&5
|
||||
echo "configure:3073: 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
|
||||
|
|
@ -3087,7 +3102,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:3091: checking for $ac_word" >&5
|
||||
echo "configure:3106: 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
|
||||
|
|
@ -3126,7 +3141,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:3130: checking for $ac_word" >&5
|
||||
echo "configure:3145: 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
|
||||
|
|
@ -3159,7 +3174,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:3163: checking for $ac_word" >&5
|
||||
echo "configure:3178: 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
|
||||
|
|
@ -3198,7 +3213,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:3202: checking for $ac_word" >&5
|
||||
echo "configure:3217: 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
|
||||
|
|
@ -3231,7 +3246,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:3235: checking for $ac_word" >&5
|
||||
echo "configure:3250: 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
|
||||
|
|
@ -3270,7 +3285,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:3274: checking for $ac_word" >&5
|
||||
echo "configure:3289: 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
|
||||
|
|
@ -3303,7 +3318,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:3307: checking for $ac_word" >&5
|
||||
echo "configure:3322: 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
|
||||
|
|
@ -3342,7 +3357,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:3346: checking for $ac_word" >&5
|
||||
echo "configure:3361: 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
|
||||
|
|
@ -3375,7 +3390,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:3379: checking for $ac_word" >&5
|
||||
echo "configure:3394: 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
|
||||
|
|
@ -3423,7 +3438,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:3427: checking for $ac_word" >&5
|
||||
echo "configure:3442: 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
|
||||
|
|
@ -3456,7 +3471,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:3460: checking for $ac_word" >&5
|
||||
echo "configure:3475: 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
|
||||
|
|
@ -3495,7 +3510,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:3499: checking for $ac_word" >&5
|
||||
echo "configure:3514: 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
|
||||
|
|
@ -3528,7 +3543,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:3532: checking for $ac_word" >&5
|
||||
echo "configure:3547: 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
|
||||
|
|
@ -3567,7 +3582,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:3571: checking for $ac_word" >&5
|
||||
echo "configure:3586: 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
|
||||
|
|
@ -3600,7 +3615,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:3604: checking for $ac_word" >&5
|
||||
echo "configure:3619: 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
|
||||
|
|
@ -3639,7 +3654,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:3643: checking for $ac_word" >&5
|
||||
echo "configure:3658: 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
|
||||
|
|
@ -3672,7 +3687,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:3676: checking for $ac_word" >&5
|
||||
echo "configure:3691: 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
|
||||
|
|
@ -3711,7 +3726,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:3715: checking for $ac_word" >&5
|
||||
echo "configure:3730: 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
|
||||
|
|
@ -3744,7 +3759,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:3748: checking for $ac_word" >&5
|
||||
echo "configure:3763: 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
|
||||
|
|
@ -3783,7 +3798,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:3787: checking for $ac_word" >&5
|
||||
echo "configure:3802: 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
|
||||
|
|
@ -3816,7 +3831,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:3820: checking for $ac_word" >&5
|
||||
echo "configure:3835: 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
|
||||
|
|
@ -3855,7 +3870,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:3859: checking for $ac_word" >&5
|
||||
echo "configure:3874: 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
|
||||
|
|
@ -3888,7 +3903,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:3892: checking for $ac_word" >&5
|
||||
echo "configure:3907: 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
|
||||
|
|
@ -3955,7 +3970,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:3959: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
echo "configure:3974: 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"
|
||||
|
|
|
|||
54
configure.in
54
configure.in
|
|
@ -66,8 +66,19 @@ progname=$0
|
|||
# if PWD already has a value, it is probably wrong.
|
||||
if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi
|
||||
|
||||
# Export original configure arguments for use by sub-configures.
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS="$progname $@"
|
||||
# Export original configure arguments for use by sub-configures. These
|
||||
# will be expanded once by make, and once by the shell, so they need to
|
||||
# have '$' quoted for make, and then each argument quoted for the shell.
|
||||
# What's more, the 'echo' below might expand backslashes.
|
||||
cat <<\EOF_SED > conftestsed
|
||||
s,\\,\\\\,g; s,\$,$$,g
|
||||
EOF_SED
|
||||
tmp="'$progname'"
|
||||
for ac_arg ; do
|
||||
tmp="$tmp '"`echo "$ac_arg" | sed -fconftestsed`
|
||||
done
|
||||
rm -f conftestsed
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS="$tmp"
|
||||
AC_SUBST(TOPLEVEL_CONFIGURE_ARGUMENTS)
|
||||
|
||||
moveifchange=${srcdir}/move-if-change
|
||||
|
|
@ -242,7 +253,8 @@ esac
|
|||
|
||||
# If both --with-headers and --with-libs are specified, default to
|
||||
# --without-newlib.
|
||||
if test x"${with_headers}" != x && test x"${with_libs}" != x ; then
|
||||
if test x"${with_headers}" != x && test x"${with_headers} != xno \
|
||||
&& test x"${with_libs}" != x && test x"${with_libs} != xno ; then
|
||||
if test x"${with_newlib}" = x ; then
|
||||
with_newlib=no
|
||||
fi
|
||||
|
|
@ -926,7 +938,7 @@ copy_dirs=
|
|||
|
||||
# Handle --with-headers=XXX. If the value is not "yes", the contents of
|
||||
# the named directory are copied to $(tooldir)/sys-include.
|
||||
if test x"${with_headers}" != x ; then
|
||||
if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
|
||||
if test x${is_cross_compiler} = xno ; then
|
||||
echo 1>&2 '***' --with-headers is only supported when cross compiling
|
||||
exit 1
|
||||
|
|
@ -943,7 +955,7 @@ fi
|
|||
# Handle --with-libs=XXX. If the value is not "yes", the contents of
|
||||
# the name directories are copied to $(tooldir)/lib. Multiple directories
|
||||
# are permitted.
|
||||
if test x"${with_libs}" != x ; then
|
||||
if test x"${with_libs}" != x && test x"${with_libs}" != xno ; then
|
||||
if test x${is_cross_compiler} = xno ; then
|
||||
echo 1>&2 '***' --with-libs is only supported when cross compiling
|
||||
exit 1
|
||||
|
|
@ -1754,20 +1766,24 @@ 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.
|
||||
baseargs=`echo " ${ac_configure_args} " | \
|
||||
sed -e 's/ --no[[^ ]]* / /' \
|
||||
-e 's/ --c[[a-z-]]*[[= ]][[^ ]]* / /' \
|
||||
-e 's/ --sr[[a-z-]]*[[= ]][[^ ]]* / /' \
|
||||
-e 's/ --ho[[a-z-]]*[[= ]][[^ ]]* / /' \
|
||||
-e 's/ --bu[[a-z-]]*[[= ]][[^ ]]* / /' \
|
||||
-e 's/ --t[[a-z-]]*[[= ]][[^ ]]* / /' \
|
||||
-e 's/ -cache-file[[= ]][[^ ]]* / /' \
|
||||
-e 's/ -srcdir[[= ]][[^ ]]* / /' \
|
||||
-e 's/ -host[[= ]][[^ ]]* / /' \
|
||||
-e 's/ -build[[= ]][[^ ]]* / /' \
|
||||
-e 's/ -target[[= ]][[^ ]]* / /' \
|
||||
-e "s/ [[^' -][^ ]*] / /" \
|
||||
-e 's/^ *//;s/ *$//'`
|
||||
cat <<\EOF_SED > conftestsed
|
||||
s/ --no[[^ ]]* / /
|
||||
s/ --c[[a-z-]]*[[= ]][[^ ]]* / /
|
||||
s/ --sr[[a-z-]]*[[= ]][[^ ]]* / /
|
||||
s/ --ho[[a-z-]]*[[= ]][[^ ]]* / /
|
||||
s/ --bu[[a-z-]]*[[= ]][[^ ]]* / /
|
||||
s/ --t[[a-z-]]*[[= ]][[^ ]]* / /
|
||||
s/ -cache-file[[= ]][[^ ]]* / /
|
||||
s/ -srcdir[[= ]][[^ ]]* / /
|
||||
s/ -host[[= ]][[^ ]]* / /
|
||||
s/ -build[[= ]][[^ ]]* / /
|
||||
s/ -target[[= ]][[^ ]]* / /
|
||||
s/ [[^' -][^ ]*] / /
|
||||
s/^ *//;s/ *$//
|
||||
s,\\,\\\\,g; s,\$,$$,g
|
||||
EOF_SED
|
||||
baseargs=`echo " ${ac_configure_args} " | sed -fconftestsed`
|
||||
rm -f conftestsed
|
||||
|
||||
# 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
|
||||
|
|
|
|||
Loading…
Reference in New Issue