[Scummvm-cvs-logs] scummvm master -> 2a5eaf4d4a41817f1a5c977ee352090b8c2aa278

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2a5eaf4d4a CONFIGURE: Use new engine dependency mechanism for sword25/zlib


Commit: 2a5eaf4d4a41817f1a5c977ee352090b8c2aa278
    https://github.com/scummvm/scummvm/commit/2a5eaf4d4a41817f1a5c977ee352090b8c2aa278
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2012-08-31T14:07:55-07:00

Commit Message:
CONFIGURE: Use new engine dependency mechanism for sword25/zlib

Changed paths:
    configure
    engines/configure.engines



diff --git a/configure b/configure
index 29c5f6c..5d440ba 100755
--- a/configure
+++ b/configure
@@ -3342,11 +3342,6 @@ fi
 define_in_config_if_yes "$_zlib" 'USE_ZLIB'
 echo "$_zlib"
 
-if test `get_engine_build sword25` = yes && test ! "$_zlib" = yes ; then
-	echo "...disabling Broken Sword 2.5 engine. ZLib is required"
-	engine_disable sword25
-fi
-
 #
 # Check for Sparkle if updates support is enabled
 #
diff --git a/engines/configure.engines b/engines/configure.engines
index f88b3fe..0352f6a 100644
--- a/engines/configure.engines
+++ b/engines/configure.engines
@@ -36,7 +36,7 @@ add_engine sci32 "SCI32 games" no
 add_engine sky "Beneath a Steel Sky" yes
 add_engine sword1 "Broken Sword" yes
 add_engine sword2 "Broken Sword II" yes
-add_engine sword25 "Broken Sword 2.5" no "" "png"
+add_engine sword25 "Broken Sword 2.5" no "" "png zlib"
 add_engine teenagent "Teen Agent" yes
 add_engine testbed "TestBed: the Testing framework" no
 add_engine tinsel "Tinsel" yes