[Scummvm-cvs-logs] SF.net SVN: scummvm: [31914] scummvm/trunk/configure

[jvprat at users.sourceforge.net]

Revision: 31914
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31914&view=rev
Author:   jvprat
Date:     2008-05-06 18:15:46 -0700 (Tue, 06 May 2008)

Log Message:
-----------
Reject invalid option combinations when enabling/disabling engines

Modified Paths:
--------------
    scummvm/trunk/configure

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2008-05-07 00:35:55 UTC (rev 31913)
+++ scummvm/trunk/configure	2008-05-07 01:15:46 UTC (rev 31914)
@@ -373,6 +373,13 @@
 		opt=yes
 	fi
 	engine=`echo $eng | sed 's/-/_/g'`
+
+	# Filter the parameter for the subengines
+	if test "`get_engine_sub ${engine}`" != "no" -a "$opt" != "yes" ; then
+		option_error
+		return
+	fi
+
 	if test "$opt" = "static" -o "$opt" = "dynamic" -o "$opt" = "yes" ; then
 		if test "`get_engine_name ${engine}`" != "" -a "`get_engine_build ${engine}`" != "$opt" ; then
 			eval _engine_${engine}_build=$opt
@@ -386,6 +393,12 @@
 
 # Disable the given engine
 engine_disable() {
+	# Filter malformed options
+	if ( echo $1 | grep '=' ) 2> /dev/null > /dev/null ; then
+		option_error
+		return
+	fi
+
 	engine=`echo $1 | sed 's/-/_/g'`
 	if test "`get_engine_name ${engine}`" != "" -a "`get_engine_build $engine`" != "no" ; then
 		eval _engine_${engine}_build=no


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.