* 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 9fd8d92efccfd9d8f8a1a44a6bb1a7b90e74e691..cfc19a413860f8cf331013dbcfe86dc64ca23dfd 100644 (file)
--- 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 3ae19743b768403843004e08b877ac6deb5aa57a..f2497ada4f8e796ed4177520a94f233587e8609a 100644 (file)
--- 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