[Scummvm-cvs-logs] scummvm master -> 9e1829173ce4d79effd5b669cbfbe5ac3c7444ec

wjp wjp at usecode.org
Sat Nov 26 15:41:22 CET 2011


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:
9e1829173c BUILD: Report more specific errors for configure engine options


Commit: 9e1829173ce4d79effd5b669cbfbe5ac3c7444ec
    https://github.com/scummvm/scummvm/commit/9e1829173ce4d79effd5b669cbfbe5ac3c7444ec
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-11-26T06:40:49-08:00

Commit Message:
BUILD: Report more specific errors for configure engine options

Changed paths:
    configure



diff --git a/configure b/configure
index 4fc24b1..2acb24d 100755
--- a/configure
+++ b/configure
@@ -428,6 +428,21 @@ Try \`$0 --help' for more information." >&2
 	exit 1
 }
 
+# Show an error about an unknown engine
+engine_option_error() {
+	echo "error: unrecognised engine: $1
+Try \`$0 --help' for more information." >&2
+	exit 1
+}
+
+# Show an error about an invalid subengine option
+subengine_option_error() {
+	echo "error: this option is invalid for the subengine $1: $ac_option
+Try \`$0 --help' for more information." >&2
+	exit 1
+}
+
+
 
 #
 # Engine handling functions
@@ -490,7 +505,7 @@ engine_enable() {
 
 	# Filter the parameter for the subengines
 	if test "`get_engine_sub ${engine}`" != "no" -a "$opt" != "yes" ; then
-		option_error
+		subengine_option_error ${engine}
 		return
 	fi
 
@@ -498,7 +513,7 @@ engine_enable() {
 		if test "`get_engine_name ${engine}`" != "" ; then
 			set_var _engine_${engine}_build "$opt"
 		else
-			option_error
+			engine_option_error ${engine}
 		fi
 	else
 		option_error
@@ -517,7 +532,7 @@ engine_disable() {
 	if test "`get_engine_name ${engine}`" != "" ; then
 		set_var _engine_${engine}_build "no"
 	else
-		option_error
+		engine_option_error ${engine}
 	fi
 }
 






More information about the Scummvm-git-logs mailing list