From 05e19ebebad07b52ecf7bc2972759d4ba1fe0036 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Fri, 18 Oct 2019 00:44:15 +0000
Subject: build system: configure: accommodate shells that lack (default) word
 splitting.

---
 configure             |  4 ++--
 sofort/ccenv/ccenv.sh | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index f2c7f8f..8ec6f09 100755
--- a/configure
+++ b/configure
@@ -71,7 +71,7 @@ init_vars()
 
 	mb_vars="$mb_make_vars $mb_impl_vars $mb_proj_vars $mb_flag_vars"
 
-	for mb_var in $mb_vars ; do
+	for mb_var in $(printf "$mb_vars") ; do
 		mb_expr=$mb_var='${'$mb_var':-}'
 		eval "$mb_expr"
 	done
@@ -390,7 +390,7 @@ config_copy()
 			| grep -v '^#')
 
 	mb_sed_substs=" \
-		$(for __var in $mb_vars; do                  \
+		$(for __var in $(printf %s "$mb_vars"); do   \
 			printf '%s"$%s"%s' "-e 's^@$__var@^'" \
 				"mb_$__var" "'^g' ";           \
 		done)"
diff --git a/sofort/ccenv/ccenv.sh b/sofort/ccenv/ccenv.sh
index 5454d03..dbfb12b 100644
--- a/sofort/ccenv/ccenv.sh
+++ b/sofort/ccenv/ccenv.sh
@@ -51,7 +51,7 @@ ccenv_comment()
 ccenv_find_tool()
 {
 	if [ -z "$ccenv_prefixes" ]; then
-		for ccenv_tool in $ccenv_candidates; do
+		for ccenv_tool in $(printf %s "$ccenv_candidates"); do
 			if [ -z ${@:-} ]; then
 				if command -v "$ccenv_tool" > /dev/null; then
 					return 0
@@ -70,8 +70,8 @@ ccenv_find_tool()
 		return 0
 	fi
 
-	for ccenv_prefix in $ccenv_prefixes; do
-		for ccenv_candidate in $ccenv_candidates; do
+	for ccenv_prefix in $(printf %s "$ccenv_prefixes"); do
+		for ccenv_candidate in $(printf %s "$ccenv_candidates"); do
 			ccenv_tool="$ccenv_prefix$ccenv_candidate"
 
 			if command -v "$ccenv_tool" > /dev/null; then
@@ -80,7 +80,7 @@ ccenv_find_tool()
 		done
 	done
 
-	for ccenv_tool in $ccenv_candidates; do
+	for ccenv_tool in $(printf %s "$ccenv_candidates"); do
 		if command -v "$ccenv_tool" > /dev/null; then
 			return 0
 		fi
@@ -98,7 +98,7 @@ ccenv_set_primary_tools()
 	ccenv_hack_tools="addr2line cov elfedit readelf readobj otool"
 	ccenv_peep_tools="perk mdso dlltool windmc windres"
 
-	for __tool in $ccenv_core_tools $ccenv_hack_tools $ccenv_peep_tools; do
+	for __tool in $(printf %s "$ccenv_core_tools $ccenv_hack_tools $ccenv_peep_tools"); do
 		if [ -n "$mb_agnostic" ]; then
 			ccenv_candidates=" $__tool"
 
@@ -1000,7 +1000,7 @@ ccenv_output_defs()
 	ccenv_exvars="ccenv_cfgtype ccenv_makevar_prefix"
 
 	ccenv_sed_substs=" \
-		$(for __var in $ccenv_vars $ccenv_exvars; do \
+		$(for __var in $(printf %s "$ccenv_vars $ccenv_exvars"); do \
 			printf '%s"$%s"%s' "-e 's/@$__var@/'" \
 				"$__var" "'/g' ";              \
 		done)"
@@ -1010,7 +1010,7 @@ ccenv_output_defs()
 		> "$ccenv_mk"
 
 	if [ "$ccenv_cfgtype" = 'host' ]; then
-		for __var in $ccenv_vars; do
+		for __var in $(printf %s "$ccenv_vars"); do
 			ccenv_src_var=$__var
 			ccenv_dst_var=mb_${__var#*ccenv_}
 			ccenv_var_expr='${'$ccenv_src_var':-}'
@@ -1021,7 +1021,7 @@ ccenv_output_defs()
 		mb_host=$ccenv_host
 		mb_cchost=$ccenv_cchost
 	else
-		for __var in $ccenv_vars; do
+		for __var in $(printf %s "$ccenv_vars"); do
 			ccenv_src_var=$__var
 			ccenv_dst_var=mb_native_${__var#*ccenv_}
 			ccenv_var_expr='${'$ccenv_src_var':-}'
-- 
cgit v1.2.3