JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2003-05-19 Nathanael Nerode <neroden@gcc.gnu.org> 

* configure.in: Switch more things to use maybe dependencies.
	* Makefile.tpl: Switch more things to use maybe dependencies.
	Factor out common code from autogen IF statements.
	* configure: Regenerate.
	* Makefile.in: Regenerate.
This commit is contained in:
Nathanael Nerode 2003-05-20 01:05:39 +00:00
parent 08049c016e
commit 70ffc14893
5 changed files with 472 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2003-05-19 Nathanael Nerode <neroden@gcc.gnu.org>
* configure.in: Switch more things to use maybe dependencies.
* Makefile.tpl: Switch more things to use maybe dependencies.
Factor out common code from autogen IF statements.
* configure: Regenerate.
* Makefile.in: Regenerate.
2003-05-14 Kelley Cook <kelleycook@wideopenwest.com> 2003-05-14 Kelley Cook <kelleycook@wideopenwest.com>
* configure.in: Accept i[3456789]86 for machine type. * configure.in: Accept i[3456789]86 for machine type.

553
Makefile.in
View File

File diff suppressed because it is too large Load Diff

37
Makefile.tpl
View File

@ -743,8 +743,13 @@ check:
$(MAKE) do-check NOTPARALLEL=parallel-ok $(MAKE) do-check NOTPARALLEL=parallel-ok
# Only include modules actually being configured and built. # Only include modules actually being configured and built.
do-check: @check_host_modules@ \ do-check: maybe-check-gcc [+
@check_target_modules@ FOR host_modules +] \
maybe-check-[+module+][+
ENDFOR host_modules +][+
FOR target_modules +] \
maybe-check-target-[+module+][+
ENDFOR target_modules +]
# Automated reporting of test results. # Automated reporting of test results.
@ -772,11 +777,18 @@ mail-report-with-warnings.log: warning.log
.PHONY: install uninstall .PHONY: install uninstall
install: installdirs install-host install-target install: installdirs install-host install-target
.PHONY: install-host-nogcc
install-host-nogcc: [+
FOR host_modules +] \
maybe-install-[+module+][+
ENDFOR host_modules +]
.PHONY: install-host .PHONY: install-host
install-host: maybe-install-gcc [+ install-host: maybe-install-gcc [+
FOR host_modules +] \ FOR host_modules +] \
maybe-install-[+module+][+ maybe-install-[+module+][+
ENDFOR host_modules +] ENDFOR host_modules +]
.PHONY: install-target .PHONY: install-target
install-target: [+ install-target: [+
FOR target_modules +] \ FOR target_modules +] \
@ -800,7 +812,7 @@ install.all: install-no-fixedincludes
# install-no-fixedincludes is used because Cygnus can not distribute # install-no-fixedincludes is used because Cygnus can not distribute
# the fixed header files. # the fixed header files.
.PHONY: install-no-fixedincludes .PHONY: install-no-fixedincludes
install-no-fixedincludes: installdirs @install_host_modules_nogcc@ \ install-no-fixedincludes: installdirs install-host-nogcc \
install-target gcc-no-fixedincludes install-target gcc-no-fixedincludes
### other supporting targets ### other supporting targets
@ -962,11 +974,11 @@ all-[+module+]: configure-[+module+]
+] $(X11_FLAGS_TO_PASS)[+ +] $(X11_FLAGS_TO_PASS)[+
ENDIF with_x +] all) ENDIF with_x +] all)
.PHONY: check-[+module+] maybe-check-[+module+]
maybe-check-[+module+]:
[+ IF no_check +] [+ IF no_check +]
.PHONY: check-[+module+]
check-[+module+]: check-[+module+]:
[+ ELIF no_check_cross +] [+ ELIF no_check_cross +]
.PHONY: check-[+module+]
# This module is only tested in a native toolchain. # This module is only tested in a native toolchain.
check-[+module+]: check-[+module+]:
@if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ @if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
@ -979,7 +991,6 @@ check-[+module+]:
ENDIF with_x +] check); \ ENDIF with_x +] check); \
fi fi
[+ ELSE check +] [+ ELSE check +]
.PHONY: check-[+module+]
check-[+module+]: check-[+module+]:
@r=`${PWD}`; export r; \ @r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; export s; \
@ -990,13 +1001,11 @@ check-[+module+]:
ENDIF with_x +] check) ENDIF with_x +] check)
[+ ENDIF no_check +] [+ ENDIF no_check +]
[+ IF no_install +]
.PHONY: install-[+module+] maybe-install-[+module+] .PHONY: install-[+module+] maybe-install-[+module+]
maybe-install-[+module+]: maybe-install-[+module+]:
[+ IF no_install +]
install-[+module+]: install-[+module+]:
[+ ELSE install +] [+ ELSE install +]
.PHONY: install-[+module+] maybe-install-[+module+]
maybe-install-[+module+]:
install-[+module+]: installdirs install-[+module+]: installdirs
@r=`${PWD}`; export r; \ @r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; export s; \
@ -1101,12 +1110,13 @@ all-target-[+module+]: configure-target-[+module+]
+] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+
ENDIF raw_cxx ENDIF raw_cxx
+] all) +] all)
.PHONY: check-target-[+module+] maybe-check-target-[+module+]
maybe-check-target-[+module+]:
[+ IF no_check +] [+ IF no_check +]
# Dummy target for uncheckable module. # Dummy target for uncheckable module.
.PHONY: check-target-[+module+]
check-target-[+module+]: check-target-[+module+]:
[+ ELSE check +] [+ ELSE check +]
.PHONY: check-target-[+module+]
check-target-[+module+]: check-target-[+module+]:
@r=`${PWD}`; export r; \ @r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; export s; \
@ -1118,14 +1128,13 @@ check-target-[+module+]:
ENDIF raw_cxx ENDIF raw_cxx
+] check) +] check)
[+ ENDIF no_check +] [+ ENDIF no_check +]
[+ IF no_install +]
.PHONY: install-target-[+module+] maybe-install-target-[+module+] .PHONY: install-target-[+module+] maybe-install-target-[+module+]
maybe-install-target-[+module+]: maybe-install-target-[+module+]:
[+ IF no_install +]
# Dummy target for uninstallable. # Dummy target for uninstallable.
install-target-[+module+]: install-target-[+module+]:
[+ ELSE install +] [+ ELSE install +]
.PHONY: install-target-[+module+] maybe-install-target-[+module+]
maybe-install-target-[+module+]:
install-target-[+module+]: installdirs install-target-[+module+]: installdirs
@r=`${PWD}`; export r; \ @r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; export s; \

87
configure vendored
View File

@ -2306,19 +2306,6 @@ for module in ${build_modules} ; do
configure_build_modules=configure-build-${module} configure_build_modules=configure-build-${module}
done done
check_host_modules=
install_host_modules=
for module in ${configdirs} ; do
check_host_modules="${check_host_modules} check-${module}"
install_host_modules="${install_host_modules} install-${module}"
done
install_host_modules_nogcc=`echo "${install_host_modules}" | sed -e 's/install-gcc//g'`
check_target_modules=
for module in ${target_configdirs} ; do
check_target_modules="${check_target_modules} check-target-${module}"
done
# Determine whether gdb needs tk/tcl or not. # Determine whether gdb needs tk/tcl or not.
# Use 'maybe' since enable_gdbtk might be true even if tk isn't available # Use 'maybe' since enable_gdbtk might be true even if tk isn't available
# and in that case we want gdb to be built without tk. Ugh! # and in that case we want gdb to be built without tk. Ugh!
@ -2354,7 +2341,7 @@ rm -f maybedep.tmp
echo '# maybedep.tmp' > maybedep.tmp echo '# maybedep.tmp' > maybedep.tmp
# Make-targets which may need maybe dependencies. # Make-targets which may need maybe dependencies.
mts="configure all install" mts="configure all install check"
# Loop over modules and make-targets. # Loop over modules and make-targets.
for module in ${build_modules} ; do for module in ${build_modules} ; do
@ -2682,13 +2669,10 @@ ospace_frag=${srcdir}/${ospace_frag}
# Target module lists & subconfigure args. # Target module lists & subconfigure args.
# Build tools. # Build tools.
@ -2707,7 +2691,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. # 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 set dummy ${ncn_tool_prefix}ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2711: checking for $ac_word" >&5 echo "configure:2695: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -2740,7 +2724,7 @@ if test -z "$ac_cv_prog_AR" ; then
# Extract the first word of "ar", so it can be a program name with args. # Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2 set dummy ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2744: checking for $ac_word" >&5 echo "configure:2728: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -2779,7 +2763,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}as", so it can be a program name with args. # 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 set dummy ${ncn_tool_prefix}as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2783: checking for $ac_word" >&5 echo "configure:2767: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -2812,7 +2796,7 @@ if test -z "$ac_cv_prog_AS" ; then
# Extract the first word of "as", so it can be a program name with args. # Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2 set dummy as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2816: checking for $ac_word" >&5 echo "configure:2800: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -2851,7 +2835,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}dlltool", so it can be a program name with args. # 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 set dummy ${ncn_tool_prefix}dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2855: checking for $ac_word" >&5 echo "configure:2839: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -2884,7 +2868,7 @@ if test -z "$ac_cv_prog_DLLTOOL" ; then
# Extract the first word of "dlltool", so it can be a program name with args. # Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2 set dummy dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2888: checking for $ac_word" >&5 echo "configure:2872: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -2923,7 +2907,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}ld", so it can be a program name with args. # 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 set dummy ${ncn_tool_prefix}ld; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2927: checking for $ac_word" >&5 echo "configure:2911: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -2956,7 +2940,7 @@ if test -z "$ac_cv_prog_LD" ; then
# Extract the first word of "ld", so it can be a program name with args. # Extract the first word of "ld", so it can be a program name with args.
set dummy ld; ac_word=$2 set dummy ld; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2960: checking for $ac_word" >&5 echo "configure:2944: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -2995,7 +2979,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}nm", so it can be a program name with args. # 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 set dummy ${ncn_tool_prefix}nm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2999: checking for $ac_word" >&5 echo "configure:2983: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3028,7 +3012,7 @@ if test -z "$ac_cv_prog_NM" ; then
# Extract the first word of "nm", so it can be a program name with args. # Extract the first word of "nm", so it can be a program name with args.
set dummy nm; ac_word=$2 set dummy nm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3032: checking for $ac_word" >&5 echo "configure:3016: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3067,7 +3051,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}ranlib", so it can be a program name with args. # 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 set dummy ${ncn_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3071: checking for $ac_word" >&5 echo "configure:3055: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3100,7 +3084,7 @@ if test -z "$ac_cv_prog_RANLIB" ; then
# Extract the first word of "ranlib", so it can be a program name with args. # Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2 set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3104: checking for $ac_word" >&5 echo "configure:3088: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3139,7 +3123,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}windres", so it can be a program name with args. # 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 set dummy ${ncn_tool_prefix}windres; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3143: checking for $ac_word" >&5 echo "configure:3127: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3172,7 +3156,7 @@ if test -z "$ac_cv_prog_WINDRES" ; then
# Extract the first word of "windres", so it can be a program name with args. # Extract the first word of "windres", so it can be a program name with args.
set dummy windres; ac_word=$2 set dummy windres; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3176: checking for $ac_word" >&5 echo "configure:3160: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3211,7 +3195,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}objcopy", so it can be a program name with args. # 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 set dummy ${ncn_tool_prefix}objcopy; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3215: checking for $ac_word" >&5 echo "configure:3199: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3244,7 +3228,7 @@ if test -z "$ac_cv_prog_OBJCOPY" ; then
# Extract the first word of "objcopy", so it can be a program name with args. # Extract the first word of "objcopy", so it can be a program name with args.
set dummy objcopy; ac_word=$2 set dummy objcopy; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3248: checking for $ac_word" >&5 echo "configure:3232: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3283,7 +3267,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}objdump", so it can be a program name with args. # 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 set dummy ${ncn_tool_prefix}objdump; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3287: checking for $ac_word" >&5 echo "configure:3271: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3316,7 +3300,7 @@ if test -z "$ac_cv_prog_OBJDUMP" ; then
# Extract the first word of "objdump", so it can be a program name with args. # Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2 set dummy objdump; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3320: checking for $ac_word" >&5 echo "configure:3304: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3364,7 +3348,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}ar", so it can be a program name with args. # 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 set dummy ${ncn_target_tool_prefix}ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3368: checking for $ac_word" >&5 echo "configure:3352: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3397,7 +3381,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. # Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2 set dummy ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3401: checking for $ac_word" >&5 echo "configure:3385: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3436,7 +3420,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}as", so it can be a program name with args. # 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 set dummy ${ncn_target_tool_prefix}as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3440: checking for $ac_word" >&5 echo "configure:3424: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3469,7 +3453,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. # Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2 set dummy as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3473: checking for $ac_word" >&5 echo "configure:3457: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3508,7 +3492,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}dlltool", so it can be a program name with args. # 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 set dummy ${ncn_target_tool_prefix}dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3512: checking for $ac_word" >&5 echo "configure:3496: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3541,7 +3525,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. # Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2 set dummy dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3545: checking for $ac_word" >&5 echo "configure:3529: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3580,7 +3564,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}ld", so it can be a program name with args. # 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 set dummy ${ncn_target_tool_prefix}ld; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3584: checking for $ac_word" >&5 echo "configure:3568: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3613,7 +3597,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. # Extract the first word of "ld", so it can be a program name with args.
set dummy ld; ac_word=$2 set dummy ld; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3617: checking for $ac_word" >&5 echo "configure:3601: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3652,7 +3636,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}nm", so it can be a program name with args. # 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 set dummy ${ncn_target_tool_prefix}nm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3656: checking for $ac_word" >&5 echo "configure:3640: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3685,7 +3669,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. # Extract the first word of "nm", so it can be a program name with args.
set dummy nm; ac_word=$2 set dummy nm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3689: checking for $ac_word" >&5 echo "configure:3673: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3724,7 +3708,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}ranlib", so it can be a program name with args. # 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 set dummy ${ncn_target_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3728: checking for $ac_word" >&5 echo "configure:3712: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3757,7 +3741,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. # Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2 set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3761: checking for $ac_word" >&5 echo "configure:3745: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3796,7 +3780,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}windres", so it can be a program name with args. # 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 set dummy ${ncn_target_tool_prefix}windres; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3800: checking for $ac_word" >&5 echo "configure:3784: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3829,7 +3813,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. # Extract the first word of "windres", so it can be a program name with args.
set dummy windres; ac_word=$2 set dummy windres; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3833: checking for $ac_word" >&5 echo "configure:3817: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -3896,7 +3880,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_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 $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
echo "configure:3900: checking whether to enable maintainer-specific portions of Makefiles" >&5 echo "configure:3884: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode" enableval="$enable_maintainer_mode"
@ -4109,11 +4093,8 @@ s%@configure_build_modules@%$configure_build_modules%g
s%@all_build_modules@%$all_build_modules%g s%@all_build_modules@%$all_build_modules%g
s%@host_configargs@%$host_configargs%g s%@host_configargs@%$host_configargs%g
s%@configdirs@%$configdirs%g s%@configdirs@%$configdirs%g
s%@check_host_modules@%$check_host_modules%g
s%@install_host_modules_nogcc@%$install_host_modules_nogcc%g
s%@target_configargs@%$target_configargs%g s%@target_configargs@%$target_configargs%g
s%@target_configdirs@%$target_configdirs%g s%@target_configdirs@%$target_configdirs%g
s%@check_target_modules@%$check_target_modules%g
s%@BISON@%$BISON%g s%@BISON@%$BISON%g
s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g
s%@LEX@%$LEX%g s%@LEX@%$LEX%g

18
configure.in
View File

@ -1620,19 +1620,6 @@ for module in ${build_modules} ; do
configure_build_modules=configure-build-${module} configure_build_modules=configure-build-${module}
done done
check_host_modules=
install_host_modules=
for module in ${configdirs} ; do
check_host_modules="${check_host_modules} check-${module}"
install_host_modules="${install_host_modules} install-${module}"
done
install_host_modules_nogcc=`echo "${install_host_modules}" | sed -e 's/install-gcc//g'`
check_target_modules=
for module in ${target_configdirs} ; do
check_target_modules="${check_target_modules} check-target-${module}"
done
# Determine whether gdb needs tk/tcl or not. # Determine whether gdb needs tk/tcl or not.
# Use 'maybe' since enable_gdbtk might be true even if tk isn't available # Use 'maybe' since enable_gdbtk might be true even if tk isn't available
# and in that case we want gdb to be built without tk. Ugh! # and in that case we want gdb to be built without tk. Ugh!
@ -1668,7 +1655,7 @@ rm -f maybedep.tmp
echo '# maybedep.tmp' > maybedep.tmp echo '# maybedep.tmp' > maybedep.tmp
# Make-targets which may need maybe dependencies. # Make-targets which may need maybe dependencies.
mts="configure all install" mts="configure all install check"
# Loop over modules and make-targets. # Loop over modules and make-targets.
for module in ${build_modules} ; do for module in ${build_modules} ; do
@ -1994,13 +1981,10 @@ AC_SUBST(all_build_modules)
# Host module lists & subconfigure args. # Host module lists & subconfigure args.
AC_SUBST(host_configargs) AC_SUBST(host_configargs)
AC_SUBST(configdirs) AC_SUBST(configdirs)
AC_SUBST(check_host_modules)
AC_SUBST(install_host_modules_nogcc)
# Target module lists & subconfigure args. # Target module lists & subconfigure args.
AC_SUBST(target_configargs) AC_SUBST(target_configargs)
AC_SUBST(target_configdirs) AC_SUBST(target_configdirs)
AC_SUBST(check_target_modules)
# Build tools. # Build tools.
AC_SUBST(BISON) AC_SUBST(BISON)