From abf103fb2f11339cf61d69e5b09c80c0cf4847ac Mon Sep 17 00:00:00 2001
From: Rafael Avila de Espindola <espindola@google.com>
Date: Wed, 14 May 2008 17:45:03 +0000
Subject: [PATCH] backport: config-ml.in: don't handle --enable-shared and
 --enable-static.

2008-05-14  Rafael Espindola  <espindola@google.com>

	Backport from mainline:
	2008-05-14  Rafael Espindola  <espindola@google.com>

	* config-ml.in: don't handle --enable-shared and --enable-static.

From-SVN: r135301
---
 ChangeLog    | 7 +++++++
 config-ml.in | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 135b8f38a1a..b14cd603d0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-14  Rafael Espindola  <espindola@google.com>
+
+	Backport from mainline:
+	2008-05-14  Rafael Espindola  <espindola@google.com>
+
+	* config-ml.in: don't handle --enable-shared and --enable-static.
+
 2008-03-05  Release Manager
 
 	* GCC 4.3.0 released.
diff --git a/config-ml.in b/config-ml.in
index 3ae19743b76..f2497ada4f8 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -135,7 +135,12 @@ do
 	*)	optarg=yes ;;
 	esac
 	enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
-	eval $enableopt="$optarg"
+	# enable_shared and enable_static are handled by configure.
+	# Don't undo its work.
+	case $enableopt in
+	enable_shared | enable_static) ;;
+	*) eval $enableopt="$optarg" ;;
+	esac
 	;;
   --norecursion | --no-recursion)
 	ml_norecursion=yes