From 8f30a41ecba0414c775e38bc196d06e779f60e33 Mon Sep 17 00:00:00 2001
From: David Edelsohn <dje.gcc@gmail.com>
Date: Fri, 18 Feb 1994 21:23:25 +0000
Subject: [PATCH] * configure.in: Remove embedded newlines from configdirs.
 Avoid mismatches of substrings.  Fix matching strings at end of configdirs.

---
 ChangeLog    |  6 ++++++
 configure.in | 12 +++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eb245e176e..534bacafff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 18 12:50:15 1994  Doug Evans  (dje@cygnus.com)
+
+	* configure.in: Remove embedded newlines from configdirs.
+	Avoid mismatches of substrings.  Fix matching strings at end
+	of configdirs.
+
 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 cecd71b271..14b53d1c17 100644
--- a/configure.in
+++ b/configure.in
@@ -69,8 +69,10 @@ native_only="autoconf cvs emacs fileutils find grep groff gzip hello indent
 cross_only="xiberty newlib"
 
 ## All tools belong in one of the four categories, and are assigned above
+## We assign ${configdirs} this way to remove all embedded newlines.  This
+## is important because configure will choke if they ever get through.
 #
-configdirs="${host_libs} ${host_tools} ${target_libs} ${target_tools}"
+configdirs=`echo ${host_libs} ${host_tools} ${target_libs} ${target_tools}`
 
 ################################################################################
 
@@ -125,7 +127,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 +145,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 +265,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