From: Rafael Espindola <espindola@google.com>
Date: Tue, 17 Jun 2008 22:21:56 +0000 (+0200)
Subject: * config-ml.in: don't handle --enable-shared and --enable-static.
X-Git-Tag: v1.10b~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c63a75dfb79ae53a0cd5c1f5889dc3e7126e899;p=thirdparty%2Fautomake.git

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

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 9fd8d92ef..cfc19a413 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-18  Rafael Espindola  <espindola@google.com>
+
+	* config-ml.in: don't handle --enable-shared and --enable-static.
+
 2008-06-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* lib/am/inst-vars.am (am__install_max): New variable.
diff --git a/lib/config-ml.in b/lib/config-ml.in
index 3ae19743b..f2497ada4 100644
--- a/lib/config-ml.in
+++ b/lib/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