(svn r23661) -Fix (r23438): Remaining parts of configuration were skipped when grfcodec/nforenum were not usable.

This commit is contained in:
peter1138 2011-12-23 08:57:24 +00:00
parent d175528220
commit e514ca39cc

View File

@ -944,13 +944,11 @@ check_params() {
if [ -z "$grfcodec" ] && [ -n "$nforenum" ]; then if [ -z "$grfcodec" ] && [ -n "$nforenum" ]; then
log 1 "checking nforenum/grfcodec... nforenum needs grfcodec enabled, disabling nforenum" log 1 "checking nforenum/grfcodec... nforenum needs grfcodec enabled, disabling nforenum"
nforenum="" nforenum=""
return 0
fi fi
if [ -z "$nforenum" ] && [ -n "$grfcodec" ]; then if [ -z "$nforenum" ] && [ -n "$grfcodec" ]; then
log 1 "checking nforenum/grfcodec... grfcodec needs nforenum enabled, disabling grfcodec" log 1 "checking nforenum/grfcodec... grfcodec needs nforenum enabled, disabling grfcodec"
grfcodec="" grfcodec=""
return 0
fi fi
if [ "$os" = "DOS" ]; then if [ "$os" = "DOS" ]; then