From c80c4a58dfe602a5f96bcdf1d74955be3a6d117a Mon Sep 17 00:00:00 2001
From: Brendan Kehoe <brendan@cygnus>
Date: Thu, 19 Jun 1997 21:17:20 +0000
Subject: [PATCH] 	* configure.in: Don't set ENABLE_MULTILIB, so we'll be
 passing 	--enable-multilib down to subdirs; setting TARGET_SUBDIR was
 enough.

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

diff --git a/ChangeLog b/ChangeLog
index aa5c436522..e2e07f2b8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
+Thu Jun 19 14:16:42 1997  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* configure.in: Don't set ENABLE_MULTILIB, so we'll be passing
+	--enable-multilib down to subdirs; setting TARGET_SUBDIR was enough.
+
 Tue Jun 17 15:31:20 1997  Brendan Kehoe  <brendan@lisa.cygnus.com>
 
-	* configure.in (is_cross_compiler): If we're building
-	mips-sgi-irix6* native, turn on ENABLE_MULTILIB and set TARGET_SUBDIR.
+	* configure.in: If we're building mips-sgi-irix6* native, turn on
+	ENABLE_MULTILIB and set TARGET_SUBDIR.
 
 Tue Jun 17 12:20:59 1997  Tom Tromey  <tromey@cygnus.com>
 
diff --git a/configure.in b/configure.in
index fbab2d5a5d..e0cca66bd9 100644
--- a/configure.in
+++ b/configure.in
@@ -259,7 +259,7 @@ if [ x"${host}" = x"${target}" ] ; then
 	case "${host}" in
           # We need multilib support for irix6, to get libiberty built
 	  #  properly for o32 and n32.
-          mips-sgi-irix6*) enable_multilib=yes ; target_subdir=${host} ;;
+          mips-sgi-irix6*) target_subdir=${host} ;;
 	esac
 else
 	# similarly, don't build the targets in the 'native only'