From afcc8ecddc35f59d9c999dc3904a6259a2126c7e Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 9 Sep 2012 18:40:24 +0200
Subject: CONFIGURE: behaviour -> behavior.

Done to trigger a full rebuild on buildbot.
---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index df2c2107c8..7d490ef5be 100755
--- a/configure
+++ b/configure
@@ -94,7 +94,7 @@ _srcdir=`dirname $0`
 #
 # Default settings
 #
-# Default lib behaviour yes/no/auto
+# Default lib behavior yes/no/auto
 _vorbis=auto
 _tremor=auto
 _tremolo=no
@@ -117,7 +117,7 @@ _freetype2=auto
 _taskbar=yes
 _updates=no
 _libunity=auto
-# Default option behaviour yes/no
+# Default option behavior yes/no
 _debug_build=auto
 _release_build=auto
 _optimizations=auto
-- 
cgit v1.2.3


From 000feae4cfc06cdeec1033672e0f247ad6428973 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 11 Sep 2012 09:57:28 +0200
Subject: CONFIGURE: Do dependency checking for all enabled engines

Engines with manually specified dynamic/static were skipped previously.
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 7d490ef5be..d851228df9 100755
--- a/configure
+++ b/configure
@@ -583,7 +583,7 @@ check_engine_deps() {
 	unmet_deps=""
 
 	# Check whether the engine is enabled
-	if test `get_engine_build $1` = yes ; then
+	if test `get_engine_build $1` != "no" ; then
 		# Collect unmet dependencies
 		for dep in `get_engine_dependencies $1`; do
 			if test `get_feature_state $dep` = "no"; then
-- 
cgit v1.2.3


From 7c23394b3739c4350112f558a67ca61754a0ff24 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 11 Sep 2012 10:48:10 +0200
Subject: CONFIGURE: Prevent [] in subengine list from triggering globbing

---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index d851228df9..4ecf420a59 100755
--- a/configure
+++ b/configure
@@ -692,7 +692,7 @@ get_engine_build_string() {
 		engine_string="`get_engine_name $1` $engine_string"
 	fi
 
-	echo $engine_string
+	echo "$engine_string"
 }
 
 # Get the string about building subengines
@@ -729,7 +729,7 @@ get_subengines_build_string() {
 		fi
 	fi
 
-	echo $subengine_string
+	echo "$subengine_string"
 }
 
 # Engine specific build strings
-- 
cgit v1.2.3


From 08bc6f85ad28954b87ddef60635705fba48ff615 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 11 Sep 2012 18:38:14 +0200
Subject: CONFIGURE: Fix more unintentional globbing

---
 configure | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 4ecf420a59..20c4e52093 100755
--- a/configure
+++ b/configure
@@ -707,7 +707,12 @@ get_subengines_build_string() {
 		subengine_build=`get_engine_build $subeng`
 		subengine_build_default=`get_engine_build_default $subeng`
 		if test \( $subengine_build = $2 -a "$parent_status" != wip \) -o \( "$parent_status" = wip -a $subengine_build != no -a "$subengine_build_default" = no \) ; then
-			subengine_string="$subengine_string [`get_engine_name $subeng`]"
+			s="[`get_engine_name $subeng`]"
+			if test -n "$subengine_string"; then
+				subengine_string="$subengine_string $s"
+			else
+				subengine_string="$s"
+			fi
 		else
 			all=no
 		fi
@@ -4004,28 +4009,28 @@ fi
 echo
 if test -n "$_engines_built_static" ; then
 	echo "Engines (builtin):"
-	echo $_engines_built_static | sed 's/@/\
+	echo "$_engines_built_static" | sed 's/@/\
 /g
 s/#/    /g'
 fi
 
 if test -n "$_engines_built_dynamic" ; then
 	echo "Engines (plugins):"
-	echo $_engines_built_dynamic | sed 's/@/\
+	echo "$_engines_built_dynamic" | sed 's/@/\
 /g
 s/#/    /g'
 fi
 
 if test -n "$_engines_skipped" ; then
 	echo "Engines Skipped:"
-	echo $_engines_skipped | sed 's/@/\
+	echo "$_engines_skipped" | sed 's/@/\
 /g
 s/#/    /g'
 fi
 
 if test -n "$_engines_built_wip" ; then
 	echo "WARNING: This ScummVM build contains the following UNSTABLE engines:"
-	echo $_engines_built_wip | sed 's/@/\
+	echo "$_engines_built_wip" | sed 's/@/\
 /g
 s/#/    /g'
 fi
-- 
cgit v1.2.3


From 8ac07bc34908622662926d44e7cb87b70411b672 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 11 Sep 2012 18:38:40 +0200
Subject: CONFIGURE: Clean up all-games test

---
 configure | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'configure')

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
-- 
cgit v1.2.3


From f98a8bb98c16cc52ba7388f324215195d23b4959 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 11 Sep 2012 18:39:03 +0200
Subject: CONFIGURE: Automatically enable parent engine if subengine is enabled

---
 configure | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index f13f036bc6..8dadd688da 100755
--- a/configure
+++ b/configure
@@ -75,6 +75,7 @@ add_engine() {
 	set_var _engine_${1}_deps "${5}"
 	for sub in ${4}; do
 		set_var _engine_${sub}_sub "yes"
+		set_var _engine_${sub}_parent "${1}"
 	done
 }
 
@@ -518,6 +519,11 @@ get_engine_sub() {
 	echo $sub
 }
 
+# Get a subengine's parent (undefined for non-subengines)
+get_subengine_parent() {
+	get_var _engine_$1_parent
+}
+
 # Enable *all* engines
 engine_enable_all() {
 	for engine in $_engines; do
@@ -545,9 +551,15 @@ engine_enable() {
 	engine=`echo $eng | sed 's/-/_/g'`
 
 	# Filter the parameter for the subengines
-	if test "`get_engine_sub ${engine}`" != "no" -a "$opt" != "yes" ; then
-		subengine_option_error ${engine}
-		return
+	if test "`get_engine_sub ${engine}`" != "no" ; then
+		if test "$opt" != "yes" ; then
+			subengine_option_error ${engine}
+			return
+		fi
+		parent=`get_subengine_parent ${engine}`
+		if test `get_engine_build ${parent}` = "no" ; then
+			set_var _engine_${parent}_build "yes"
+		fi		
 	fi
 
 	if test "$opt" = "static" -o "$opt" = "dynamic" -o "$opt" = "yes" ; then
-- 
cgit v1.2.3


From 08d641a0be33412e8e7b23baf8ff1d595ed5227a Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 11 Sep 2012 18:39:22 +0200
Subject: CONFIGURE: Add base engine descriptions to more engines

Only SCUMM and SAGA had such a description previously.
---
 configure | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 8dadd688da..4281cbcf3d 100755
--- a/configure
+++ b/configure
@@ -750,6 +750,7 @@ get_subengines_build_string() {
 }
 
 # Engine specific build strings
+# TODO: Clean this up (and specify these base strings in configure.engines?)
 get_scumm_build_string() {
 	if test `get_engine_build $1` != no ; then
 		if test $2 != no -a "$3" != wip ; then
@@ -768,6 +769,52 @@ get_saga_build_string() {
 	fi
 }
 
+get_agos_build_string() {
+	if test `get_engine_build $1` != no ; then
+		if test $2 != no -a "$3" != wip; then
+			base="[AGOS 1 games]"
+		fi
+		get_subengines_build_string $1 $2 "$base" $3
+	fi
+}
+
+get_groovie_build_string() {
+	if test `get_engine_build $1` != no ; then
+		if test $2 != no -a "$3" != wip; then
+			base="[7th Guest]"
+		fi
+		get_subengines_build_string $1 $2 "$base" $3
+	fi
+}
+
+get_kyra_build_string() {
+	if test `get_engine_build $1` != no ; then
+		if test $2 != no -a "$3" != wip; then
+			base="[Legend of Kyrandia 1-3]"
+		fi
+		get_subengines_build_string $1 $2 "$base" $3
+	fi
+}
+
+get_sci_build_string() {
+	if test `get_engine_build $1` != no ; then
+		if test $2 != no -a "$3" != wip; then
+			base="[SCI 0-1.1 games]"
+		fi
+		get_subengines_build_string $1 $2 "$base" $3
+	fi
+}
+
+get_mohawk_build_string() {
+	if test `get_engine_build $1` != no ; then
+		if test $2 != no -a "$3" != wip; then
+			base="[Living Books]"
+		fi
+		get_subengines_build_string $1 $2 "$base" $3
+	fi
+}
+
+
 #
 # Greet user
 #
-- 
cgit v1.2.3


From 8a796d07663ecc21b951a4de587883688ca8f93b Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 11 Sep 2012 20:26:06 +0200
Subject: CONFIGURE: Move engine base support strings to configure.engines

---
 configure | 97 ++++++++++++++-------------------------------------------------
 1 file changed, 21 insertions(+), 76 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 4281cbcf3d..ca906db08f 100755
--- a/configure
+++ b/configure
@@ -72,7 +72,8 @@ add_engine() {
 	set_var _engine_${1}_build "${3}"
 	set_var _engine_${1}_build_default "${3}"
 	set_var _engine_${1}_subengines "${4}"
-	set_var _engine_${1}_deps "${5}"
+	set_var _engine_${1}_base "${5}"
+	set_var _engine_${1}_deps "${6}"
 	for sub in ${4}; do
 		set_var _engine_${sub}_sub "yes"
 		set_var _engine_${sub}_parent "${1}"
@@ -510,6 +511,11 @@ get_engine_dependencies() {
 	get_var _engine_$1_deps
 }
 
+# Get the base engine game support description
+get_engine_base() {
+	get_var _engine_$1_base
+}
+
 # Ask if this is a subengine
 get_engine_sub() {
 	sub=`get_var _engine_$1_sub`
@@ -694,13 +700,7 @@ get_engine_build_string() {
 
 	# The engine should be shown, build the string
 	if test $show = yes ; then
-		build_string_func=get_${1}_build_string
-		if ( type $build_string_func | grep function ) 2> /dev/null > /dev/null ; then
-			engine_string=`$build_string_func $1 $engine_build $2`
-		else
-			engine_string=`get_subengines_build_string $1 $engine_build "" $2`
-		fi
-
+		engine_string=`get_subengines_build_string $1 $engine_build $2`
 		engine_string="`get_engine_name $1` $engine_string"
 	fi
 
@@ -710,11 +710,17 @@ get_engine_build_string() {
 # Get the string about building subengines
 get_subengines_build_string() {
 	parent_engine=$1
-	subengine_string=$3
-	parent_status=$4
+	parent_status=$3
 	parent_engine_build_default=`get_engine_build_default $parent_engine`
+	subengine_string=""
 	all=yes
 
+	# If the base engine isn't built at all, no need to list subengines
+	# in any of the possible categories.
+	if test `get_engine_build $parent_engine` = no; then
+		return
+	fi
+
 	# If the base engine is built by default, we can never return "[all games]"
 	# as work-in-progress.
 	if test "$parent_status" = wip ; then
@@ -723,6 +729,11 @@ get_subengines_build_string() {
 		fi
 	fi
 
+	# In the static/dynamic categories, also display the engine's base games.
+	if test -n "`get_engine_subengines $parent_engine`" -a $request_status != no -a $request_status != wip; then
+		subengine_string="[`get_engine_base $parent_engine`]"
+	fi
+
 	for subeng in `get_engine_subengines $parent_engine` ; do
 		subengine_build=`get_engine_build $subeng`
 		subengine_build_default=`get_engine_build_default $subeng`
@@ -749,72 +760,6 @@ get_subengines_build_string() {
 	echo "$subengine_string"
 }
 
-# Engine specific build strings
-# TODO: Clean this up (and specify these base strings in configure.engines?)
-get_scumm_build_string() {
-	if test `get_engine_build $1` != no ; then
-		if test $2 != no -a "$3" != wip ; then
-			base="[v0-v6 games]"
-		fi
-		get_subengines_build_string $1 $2 "$base" $3
-	fi
-}
-
-get_saga_build_string() {
-	if test `get_engine_build $1` != no ; then
-		if test $2 != no -a "$3" != wip; then
-			base="[ITE]"
-		fi
-		get_subengines_build_string $1 $2 "$base" $3
-	fi
-}
-
-get_agos_build_string() {
-	if test `get_engine_build $1` != no ; then
-		if test $2 != no -a "$3" != wip; then
-			base="[AGOS 1 games]"
-		fi
-		get_subengines_build_string $1 $2 "$base" $3
-	fi
-}
-
-get_groovie_build_string() {
-	if test `get_engine_build $1` != no ; then
-		if test $2 != no -a "$3" != wip; then
-			base="[7th Guest]"
-		fi
-		get_subengines_build_string $1 $2 "$base" $3
-	fi
-}
-
-get_kyra_build_string() {
-	if test `get_engine_build $1` != no ; then
-		if test $2 != no -a "$3" != wip; then
-			base="[Legend of Kyrandia 1-3]"
-		fi
-		get_subengines_build_string $1 $2 "$base" $3
-	fi
-}
-
-get_sci_build_string() {
-	if test `get_engine_build $1` != no ; then
-		if test $2 != no -a "$3" != wip; then
-			base="[SCI 0-1.1 games]"
-		fi
-		get_subengines_build_string $1 $2 "$base" $3
-	fi
-}
-
-get_mohawk_build_string() {
-	if test `get_engine_build $1` != no ; then
-		if test $2 != no -a "$3" != wip; then
-			base="[Living Books]"
-		fi
-		get_subengines_build_string $1 $2 "$base" $3
-	fi
-}
-
-
 #
 # Greet user
 #
-- 
cgit v1.2.3


From 1b20f731d1c06a524742cdbdc82109f583b3d4f8 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 11 Sep 2012 20:51:37 +0200
Subject: CONFIGURE: Clean up subengine string generation

---
 configure | 46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index ca906db08f..a92509cf9b 100755
--- a/configure
+++ b/configure
@@ -660,27 +660,37 @@ prepare_engine_build_strings() {
 
 # Get the string about building an engine
 get_engine_build_string() {
+	engine=$1
+	request_status=$2
 	engine_string=""
 	engine_build=`get_engine_build $1`
-	engine_build_default=`get_engine_build_default $1`
+	engine_build_default=`get_engine_build_default $engine`
 	show=no
 
+	# Convert static/dynamic to yes to ease the check of subengines
+	if test $engine_build = no; then
+		subengine_filter=no
+	else
+		subengine_filter=yes
+	fi
+
 	# Check if the current engine should be shown for the current status
-	if test $engine_build = $2 ; then
+	if test $engine_build = $request_status ; then
 		show=yes
 	else
 		# Test for disabled sub-engines
-		if test $2 = no ; then
-			for subeng in `get_engine_subengines $1` ; do
+		if test $request_status = no ; then
+			for subeng in `get_engine_subengines $engine` ; do
 				if test `get_engine_build $subeng` = no ; then
-					engine_build=no
+					# In this case we to display _disabled_ subengines
+					subengine_filter=no
 					show=yes
 				fi
 			done
 		fi
 		# Test for enabled wip sub-engines
-		if test $2 = wip ; then
-			for subeng in `get_engine_subengines $1` ; do
+		if test $request_status = wip ; then
+			for subeng in `get_engine_subengines $engine` ; do
 				if test `get_engine_build $subeng` != no -a `get_engine_build_default $subeng` = no ; then
 					show=yes
 				fi
@@ -688,20 +698,16 @@ get_engine_build_string() {
 		fi
 	fi
 
-	# Convert static/dynamic to yes to ease the check of subengines
-	if test $engine_build != no ; then
-		engine_build=yes
-	fi
 
 	# Check if it is a wip engine
-	if test "$2" = "wip" -a "$engine_build" != "no" -a  "$engine_build_default" = no; then
+	if test "$request_status" = "wip" -a "$engine_build" != "no" -a  "$engine_build_default" = no; then
 		show=yes
 	fi
 
 	# The engine should be shown, build the string
 	if test $show = yes ; then
-		engine_string=`get_subengines_build_string $1 $engine_build $2`
-		engine_string="`get_engine_name $1` $engine_string"
+		engine_string=`get_subengines_build_string $engine $subengine_filter $request_status`
+		engine_string="`get_engine_name $engine` $engine_string"
 	fi
 
 	echo "$engine_string"
@@ -710,7 +716,8 @@ get_engine_build_string() {
 # Get the string about building subengines
 get_subengines_build_string() {
 	parent_engine=$1
-	parent_status=$3
+	subengine_filter=$2
+	request_status=$3
 	parent_engine_build_default=`get_engine_build_default $parent_engine`
 	subengine_string=""
 	all=yes
@@ -723,7 +730,7 @@ get_subengines_build_string() {
 
 	# 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 "$request_status" = wip ; then
 		if test $parent_engine_build_default = yes ; then
 			all=no
 		fi
@@ -737,7 +744,10 @@ get_subengines_build_string() {
 	for subeng in `get_engine_subengines $parent_engine` ; do
 		subengine_build=`get_engine_build $subeng`
 		subengine_build_default=`get_engine_build_default $subeng`
-		if test \( $subengine_build = $2 -a "$parent_status" != wip \) -o \( "$parent_status" = wip -a $subengine_build != no -a "$subengine_build_default" = no \) ; then
+
+		# Display this subengine if it matches the filter, unless it is
+		# a stable subengine in the WIP request.
+		if test $subengine_build = $subengine_filter -a \! \( "$request_status" = wip -a "$subengine_build_default" = yes \) ; then
 			s="[`get_engine_name $subeng`]"
 			if test -n "$subengine_string"; then
 				subengine_string="$subengine_string $s"
@@ -749,7 +759,7 @@ get_subengines_build_string() {
 		fi
 	done
 
-	if test $2 != no ; then
+	if test $subengine_filter != no ; then
 		if test -n "$subengine_string" ; then
 			if test $all = yes ; then
 				subengine_string="[all games]"
-- 
cgit v1.2.3


From f8e93ea9f79d6d59fbcf97b219251e6c0fbeb9c7 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 11 Sep 2012 21:04:45 +0200
Subject: CONFIGURE: Clarify all-games status output checks

---
 configure | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index a92509cf9b..008593927f 100755
--- a/configure
+++ b/configure
@@ -720,7 +720,6 @@ get_subengines_build_string() {
 	request_status=$3
 	parent_engine_build_default=`get_engine_build_default $parent_engine`
 	subengine_string=""
-	all=yes
 
 	# If the base engine isn't built at all, no need to list subengines
 	# in any of the possible categories.
@@ -728,13 +727,23 @@ get_subengines_build_string() {
 		return
 	fi
 
-	# If the base engine is built by default, we can never return "[all games]"
-	# as work-in-progress.
-	if test "$request_status" = wip ; then
-		if test $parent_engine_build_default = yes ; then
+	all=yes
+	# If there are no subengines, never display "[all games]" (for brevity).
+	if test -z "`get_engine_subengines $parent_engine`"; then
+		all=no
+	fi
+	# If the base engine does not fit the category we're displaying here
+	# (WIP or Skipped), we should never show "[all games]"
+	if test "$request_status" = wip; then
+		if test $parent_engine_build_default = yes; then
 			all=no
 		fi
 	fi
+	if test "$request_status" = no; then
+		# If we're here, the parent engine is built, so no need to check that.
+		all=no
+	fi
+
 
 	# In the static/dynamic categories, also display the engine's base games.
 	if test -n "`get_engine_subengines $parent_engine`" -a $request_status != no -a $request_status != wip; then
@@ -759,12 +768,9 @@ get_subengines_build_string() {
 		fi
 	done
 
-	if test $subengine_filter != no ; then
-		if test -n "$subengine_string" ; then
-			if test $all = yes ; then
-				subengine_string="[all games]"
-			fi
-		fi
+	# Summarize the full list, where applicable
+	if test $all = yes ; then
+		subengine_string="[all games]"
 	fi
 
 	echo "$subengine_string"
-- 
cgit v1.2.3


From f16bb13f94dcaee1ece52598efd14ef84864794b Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Thu, 13 Sep 2012 14:25:24 +0200
Subject: CONFIGURE: Update add_engine comment

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 008593927f..27b6645efe 100755
--- a/configure
+++ b/configure
@@ -62,7 +62,7 @@ get_var() {
 	eval echo \$${1}
 }
 
-# Add an engine: id name build subengines dependencies
+# Add an engine: id name build subengines base-games dependencies
 add_engine() {
 	_engines="${_engines} ${1}"
 	if test "${3}" = "no" ; then
-- 
cgit v1.2.3


From 7cdda8efd25b946f2bc3fb5558d4efe7c45ed643 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 24 Sep 2012 17:25:22 +0200
Subject: CONFIGURE: Fix subengine status output

We were reporting subengine status before checking its dependencies.
---
 configure | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 27b6645efe..a0119bb1b1 100755
--- a/configure
+++ b/configure
@@ -3981,9 +3981,6 @@ for engine in $_engines; do
 				isbuilt=STATIC_PLUGIN
 			fi
 		fi
-
-		# Prepare the information to be shown
-		prepare_engine_build_strings $engine
 	else
 		# It's a subengine, just say yes or no
 		if test "`get_engine_build $engine`" = "no" ; then
@@ -4002,6 +3999,14 @@ for engine in $_engines; do
 	fi
 done
 
+# Prepare the information to be shown
+for engine in $_engines; do
+	if test "`get_engine_sub $engine`" = "no" ; then
+		# It's a main engine
+		prepare_engine_build_strings $engine
+	fi
+done
+
 #
 # Detection of WIP/unstable engines
 #
-- 
cgit v1.2.3


From 686775138dbd2553c966f066dea53b90360bdcb3 Mon Sep 17 00:00:00 2001
From: David-John Willis
Date: Sun, 21 Oct 2012 18:46:58 +0100
Subject: CONFIGURE: Clean up OpenPandora flags and add define for
 USE_ARM_NEON_ASPECT_CORRECTOR

---
 configure | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index a0119bb1b1..8b9a9e918c 100755
--- a/configure
+++ b/configure
@@ -2525,10 +2525,13 @@ if test -n "$_host"; then
 				# Use -O3 on the OpenPandora for non-debug builds.
 				_optimization_level=-O3
 			fi
+			define_in_config_if_yes yes 'USE_ARM_NEON_ASPECT_CORRECTOR'
 			CXXFLAGS="$CXXFLAGS -march=armv7-a"
 			CXXFLAGS="$CXXFLAGS -mtune=cortex-a8"
+			CXXFLAGS="$CXXFLAGS -mfloat-abi=softfp"
 			CXXFLAGS="$CXXFLAGS -mfpu=neon"
-			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
+			CXXFLAGS="$CXXFLAGS -fsingle-precision-constant"
+			ASFLAGS="$ASFLAGS -mfloat-abi=softfp"
 			_backend="openpandora"
 			_build_hq_scalers=yes
 			_vkeybd=no
-- 
cgit v1.2.3


From b52274d011bb0e4be399dd25a04f76f6a3c22f8c Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 22 Oct 2012 23:16:07 +0200
Subject: CONFIGURE: Use -fPIC instead of -fpic on Linux and FreeBSD.

This allows compilation of plugins on PowerPC. This is done similar to what
was proposed in patch #3575572 "Fails to build on Linux PowerPC when using plugins".
I chose to use -fPIC unconditionally, since it will only make a difference on
platforms, which will require -fPIC, like PowerPC. On amd64 for example gcc
produces the same code.
---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 8b9a9e918c..336c79e332 100755
--- a/configure
+++ b/configure
@@ -2980,7 +2980,7 @@ PLUGIN_LDFLAGS		+= -Wl,-T$(srcdir)/backends/plugins/ds/plugin.ld -mthumb-interwo
 	freebsd*)
 		_plugin_prefix="lib"
 		_plugin_suffix=".so"
-		CXXFLAGS="$CXXFLAGS -fpic"
+		CXXFLAGS="$CXXFLAGS -fPIC"
 _mak_plugins='
 PLUGIN_EXTRA_DEPS =
 PLUGIN_LDFLAGS  += -shared
@@ -3024,7 +3024,7 @@ POST_OBJS_FLAGS := -Wl,-no-whole-archive
 	linux*)
 		_plugin_prefix="lib"
 		_plugin_suffix=".so"
-		CXXFLAGS="$CXXFLAGS -fpic"
+		CXXFLAGS="$CXXFLAGS -fPIC"
 		LIBS="$LIBS -ldl"
 _mak_plugins='
 PLUGIN_EXTRA_DEPS =
-- 
cgit v1.2.3