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(-)

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