From 9db4e878920729209f8d747f8aa089e647dc97ab Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 31 Mar 2010 05:44:30 +0000
Subject: [PATCH] Fix toplevel configure --enable-multilib handling.

/:
	PR bootstrap/43328
	* configure.ac: Do not pass --enable-multilib nor
	--disable-multilib in baseargs.  Accept explicitly passed
	--enable_multilib.
	* configure: Regenerate.

From-SVN: r157851
---
 ChangeLog    |  8 ++++++++
 configure    | 11 ++++++++---
 configure.ac | 11 ++++++++---
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cbffd395f85..60244b9696f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR bootstrap/43328
+	* configure.ac: Do not pass --enable-multilib nor
+	--disable-multilib in baseargs.  Accept explicitly passed
+	--enable_multilib.
+	* configure: Regenerate.
+
 2010-03-28  Andrew Pinski  <pinskia@gmail.com>
 
 	* MAINTAINERS (spu port): Remove me.
diff --git a/configure b/configure
index c2c406e7334..d885973ce6f 100755
--- a/configure
+++ b/configure
@@ -7778,6 +7778,9 @@ do
       skip_next=$separate_arg
       continue
       ;;
+    --enable-multilib | --disable-multilib)
+      continue
+      ;;
     -*)
       # An option.  Add it.
       case $ac_arg in
@@ -7846,10 +7849,12 @@ if test x${is_cross_compiler} = xyes ; then
   target_configargs="--with-cross-host=${host_noncanonical} ${target_configargs}"
 fi
 
-# Default to --enable-multilib.
-if test x${enable_multilib} = x ; then
+# Pass --enable-multilib to target dirs; default to --enable-multilib.
+case $enable_multilib in
+'' | yes)
   target_configargs="--enable-multilib ${target_configargs}"
-fi
+  ;;
+esac
 
 # Pass --with-newlib if appropriate.  Note that target_configdirs has
 # changed from the earlier setting of with_newlib.
diff --git a/configure.ac b/configure.ac
index 72407f86878..55e99980adc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2882,6 +2882,9 @@ do
       skip_next=$separate_arg
       continue
       ;;
+    --enable-multilib | --disable-multilib)
+      continue
+      ;;
     -*)
       # An option.  Add it.
       case $ac_arg in
@@ -2950,10 +2953,12 @@ if test x${is_cross_compiler} = xyes ; then
   target_configargs="--with-cross-host=${host_noncanonical} ${target_configargs}"
 fi
 
-# Default to --enable-multilib.
-if test x${enable_multilib} = x ; then
+# Pass --enable-multilib to target dirs; default to --enable-multilib.
+case $enable_multilib in
+'' | yes)
   target_configargs="--enable-multilib ${target_configargs}"
-fi
+  ;;
+esac
 
 # Pass --with-newlib if appropriate.  Note that target_configdirs has
 # changed from the earlier setting of with_newlib.