[Scummvm-cvs-logs] scummvm master -> eff6ea09fbf1b64bc37011e5c94cf8798f658150

[lordhoto]

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:
eff6ea09fb Revert "CONFIGURE: Don't disable the sword25 engine when libpng is not found"


Commit: eff6ea09fbf1b64bc37011e5c94cf8798f658150
    https://github.com/scummvm/scummvm/commit/eff6ea09fbf1b64bc37011e5c94cf8798f658150
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-08-20T17:13:19-07:00

Commit Message:
Revert "CONFIGURE: Don't disable the sword25 engine when libpng is not found"

This reverts commit 7543c3ba5fcc914a4031fc8328aacd3d28c7055d.
We depend on libpng for PNG decoding again, thus disable sword25 when libpng
is not available.

Changed paths:
    configure



diff --git a/configure b/configure
index 5ab145c..4b54832 100755
--- a/configure
+++ b/configure
@@ -3201,6 +3201,11 @@ fi
 define_in_config_if_yes "$_png" 'USE_PNG'
 echo "$_png"
 
+if test `get_engine_build sword25` = yes && test ! "$_png" = yes ; then
+	echo "...disabling Broken Sword 2.5 engine. PNG is required"
+	engine_disable sword25
+fi
+
 #
 # Check for Theora Decoder
 #