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

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@135300 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/ChangeLog b/ChangeLog
index 1ac9bcf..6b58239 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-14  Rafael Espindola  <espindola@google.com>
+
+       * config-ml.in: don't handle --enable-shared and --enable-static.
+
 2008-05-10  Richard Sandiford  <rdsandiford@googlemail.com>
 
        * MAINTAINERS: Update my email address.

diff --git a/config-ml.in b/config-ml.in
index 3ae1974..f2497ad 100644 (file)
--- 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