Hello,

* Rafael Espindola wrote on Wed, May 14, 2008 at 07:18:52PM CEST:
> 2008/5/14 Paolo Bonzini <[EMAIL PROTECTED]>:
> > Ok for trunk and 4.3, but please also handle enable_static in the
> > same way.  The patch is preapproved with this change, but please repost
> > it so that it can also go in Automake (I'm CCing Ralf and
> > automake-patches@gnu.org for this).
> 
> The final patch (to trunk) is attached. Will port to 4.3.

Apparently I overlooked this earlier, sorry about that.
Synced to Automake (master and branch-1-10) now.

Cheers,
Ralf

2008-06-18  Rafael Espindola  <[EMAIL PROTECTED]>

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

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


Reply via email to