aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2012-09-11 18:38:40 +0200
committerWillem Jan Palenstijn2012-09-11 18:38:40 +0200
commit8ac07bc34908622662926d44e7cb87b70411b672 (patch)
tree28a5233cff0a6b67a015ca993095bf57f97cc89b
parent08bc6f85ad28954b87ddef60635705fba48ff615 (diff)
downloadscummvm-rg350-8ac07bc34908622662926d44e7cb87b70411b672.tar.gz
scummvm-rg350-8ac07bc34908622662926d44e7cb87b70411b672.tar.bz2
scummvm-rg350-8ac07bc34908622662926d44e7cb87b70411b672.zip
CONFIGURE: Clean up all-games test
-rwxr-xr-xconfigure18
1 files changed, 9 insertions, 9 deletions
diff --git a/configure b/configure
index 20c4e52093..f13f036bc6 100755
--- a/configure
+++ b/configure
@@ -697,11 +697,19 @@ get_engine_build_string() {
# Get the string about building subengines
get_subengines_build_string() {
- all=yes
parent_engine=$1
subengine_string=$3
parent_status=$4
parent_engine_build_default=`get_engine_build_default $parent_engine`
+ all=yes
+
+ # If the base engine is built by default, we can never return "[all games]"
+ # as work-in-progress.
+ if test "$parent_status" = wip ; then
+ if test $parent_engine_build_default = yes ; then
+ all=no
+ fi
+ fi
for subeng in `get_engine_subengines $parent_engine` ; do
subengine_build=`get_engine_build $subeng`
@@ -716,14 +724,6 @@ get_subengines_build_string() {
else
all=no
fi
-
- # handle engines that are on by default and have a single subengine that is off by default
- if test "$parent_status" = wip ; then
- if test $parent_engine_build_default = yes -a subengine ; then
- all=no
- fi
- fi
-
done
if test $2 != no ; then