diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 10749a8..821233d 100644 --- a/configure.in +++ b/configure.in @@ -197,12 +197,8 @@ esac # Configure extra directories which are host specific case "${host}" in - i[3456]86-*-go32*) - configdirs="$configdirs dosrel" ;; - i[3456]86-*-mingw32*) - configdirs="$configdirs dosrel" ;; *-cygwin*) - configdirs="$configdirs libtermcap dosrel" ;; + configdirs="$configdirs libtermcap" ;; esac # Remove more programs from consideration, based on the host or @@ -1348,6 +1344,30 @@ sed -e "s/@RPATH_ENVVAR@/${RPATH_ENVVAR}/" Makefile > Makefile.tem rm -f Makefile mv -f Makefile.tem Makefile +# Record target_configdirs and the configure arguments for target and +# build configuration in Makefile. +target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'` + +# This is the final value for target_configdirs. configdirs already +# has its final value. It's time to create some lists of valid targets. +all_host_modules= +check_host_modules= +install_host_modules= +for module in ${configdirs} ; do + all_host_modules="${all_host_modules} all-${module}" + 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'` + +all_target_modules= +check_target_modules= +install_target_modules= +for module in ${target_configdirs} ; do + all_target_modules="${all_target_modules} all-target-${module}" + check_target_modules="${check_target_modules} check-target-${module}" + install_target_modules="${install_target_modules} install-target-${module}" +done # Base args. Strip norecursion, cache-file, srcdir, host, build, target. # These are the ones we might not want to pass down to subconfigures. @@ -1364,9 +1384,6 @@ baseargs=`echo "${arguments}" | \ # desired. buildargs="--cache-file=../config.cache --build=${build_alias} --host=${build_alias} ${baseargs}" -# Record target_configdirs and the configure arguments for target and -# build configuration in Makefile. -target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'` targargs=${baseargs} # Passing a --with-cross-host argument lets the target libraries know @@ -1548,6 +1565,13 @@ qqCXX_FOR_TARGET=`echo "$qCXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'` sedtemp=sed.$$ cat >$sedtemp <<EOF +s%@all_host_modules@%${all_host_modules}% +s%@check_host_modules@%${check_host_modules}% +s%@install_host_modules@%${install_host_modules}% +s%@install_host_modules_nogcc@%${install_host_modules_nogcc}% +s%@all_target_modules@%${all_target_modules}% +s%@check_target_modules@%${check_target_modules}% +s%@install_target_modules@%${install_target_modules}% s:@target_configdirs@:${target_configdirs}: s%@target_configargs@%${targargs}% s%@FLAGS_FOR_TARGET@%${FLAGS_FOR_TARGET}% |