From b37556c4ef06511bc6b252a86abbc3084a70afac Mon Sep 17 00:00:00 2001
From: David Edelsohn <dje.gcc@gmail.com>
Date: Fri, 18 Feb 1994 19:25:46 +0000
Subject: [PATCH] * configure.in: Avoid substring mismatches but allow matches
 to words at front and end of string.

---
 ChangeLog    | 5 +++++
 configure.in | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eb245e176e1..d356543c8eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 18 11:23:18 1994  Doug Evans  (dje@canuck.cygnus.com)
+
+	* configure.in: Avoid substring mismatches but allow matches
+	to words at front and end of string.
+
 Fri Feb 11 15:33:33 1994  Stu Grossman  (grossman at cygnus.com)
 
 	* config.guess:  Add Lynx/rs6000 config support.
diff --git a/configure.in b/configure.in
index cecd71b2712..50bc07b3a81 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
-- 
2.30.2