From c014d59723639eb190ad46ea89a940be9d0e5f81 Mon Sep 17 00:00:00 2001
From: "David D. Zuhn" <zoo@cygnus>
Date: Mon, 9 Nov 1992 05:16:57 +0000
Subject: [PATCH] * configure.in: expand the section that adds or removes
 directories from the list of programs to build, to handle native vs. cross in
 addition to host v. native * test-build.mk: add -w to GNU_MAKE

---
 configure.in | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/configure.in b/configure.in
index 9f705c1f717..61ec37ee63c 100644
--- a/configure.in
+++ b/configure.in
@@ -39,17 +39,20 @@ case "${target}" in
 		  ;;
 esac
 
-# remove various programs from consideration, if this is a cross-compiler 
-# (host != target) build, AND if the host is one that has a
-# "native" environment that we support
+
+# remove various programs from consideration.  some of these are not
+# reasonable to build for a native compilation (eg newlib).  some of these
+# aren't built for each cross compiler toolchain (eg emacs).
 
 if [ x"${host}" = x"${target}" ] ; then
-         configdirs=`echo ${configdirs} | sed -e 's/newlib//'`
+	# remove from native toolchains
+	configdirs=`echo ${configdirs} | sed -e 's/newlib//'`
 else
-	true
+	# remove from cross compilers in general
+	configdirs=`echo ${configdirs} | sed -e 's/emacs//;s/ispell//;s/rcs//;s/cvs//'`
 fi	
 
-# remove various programs from consideration, based on the host or 
+# remove more programs from consideration, based on the host or 
 # target this usually means that a port of the program doesn't
 # exist yet.
 
@@ -64,13 +67,13 @@ case "${target}" in
     configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas//'`
     ;;
   rs6000-*-*)
-    configdirs=`echo ${configdirs} | sed -e 's/gas//;s/binutils//;s/ld//'`
+    configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas//'`
     ;;
   hppa*-*-*)
-    configdirs=`echo ${configdirs} | sed -e 's/gas//;s/bfd//;s/gdb//;s/binutils//;s/gdbtest//;s/ld//;s/libg++//'`
+    configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas//;s/bfd//;s/gdb//;s/libg++//'`
     ;;
   *-*-solaris2)
-    configdirs=`echo ${configdirs} | sed -e 's/gas//'`
+    configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas//'`
     ;;
 esac
 
-- 
2.30.2