* configure.in: Avoid substring mismatches but allow matches

to words at front and end of string.

1 files changed, 4 insertions, 4 deletions

diff --git a/configure.in b/configure.in
index cecd71b..50bc07b 100644
--- a/configure.in
+++ b/configure.in
@@ -125,7 +125,7 @@ case ${with_x} in
   yes | "")  # the default value for this tree is that X11 is available
 	;;
   no)
-    	configdirs=`echo ${configdirs} | sed -e 's/tk//;/gash//'`
+    	configdirs=`echo " ${configdirs} " | sed -e 's/ tk / /;/ gash / /'`
 	;;
   *)
     	echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2
@@ -143,13 +143,13 @@ if [ x"${host}" = x"${target}" ] ; then
 	# when doing a native toolchain, don't build the targets
 	# that are in the 'cross only' list
 	for i in ${cross_only} ; do
-	  configdirs=`echo ${configdirs} | sed -e "s/$i//"`
+	  configdirs=`echo " ${configdirs} " | sed -e "s/ $i / /"`
 	done
 else
 	# similarly, don't build the targets in the 'native only' 
 	# list when building a cross compiler
 	for i in ${native_only} ; do
-	  configdirs=`echo ${configdirs} | sed -e "s/$i//"`
+	  configdirs=`echo " ${configdirs} " | sed -e "s/ $i / /"`
 	done
 fi	
 
@@ -263,7 +263,7 @@ esac
 notsupp=""
 for dir in . $noconfigdirs ; do
   if [ $dir != . ] && echo "# ${configdirs} #" | grep "${dir} " >/dev/null 2>&1 ; then
-    configdirs=`echo $configdirs | sed -e "s/${dir} / /"`
+    configdirs=`echo " $configdirs " | sed -e "s/ ${dir} / /"`
     if [ -r $srcdir/$dir/configure ] || [ -r $srcdir/$dir/configure.in ]; then
       notsupp="$notsupp $dir"
     fi