[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. Release-1-10-1-25-g23e42a2

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=23e42a2dfd92705e5989dfe23994d90fa9d090f2

The branch, branch-1-10 has been updated
       via  23e42a2dfd92705e5989dfe23994d90fa9d090f2 (commit)
      from  8acf1d4ab1ff0f5094ad5fb54d9505875c65bf96 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 23e42a2dfd92705e5989dfe23994d90fa9d090f2
Author: Rafael Espindola <address@hidden>
Date:   Wed Jun 18 00:21:56 2008 +0200

    * config-ml.in: don't handle --enable-shared and --enable-static.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |    4 ++++
 lib/config-ml.in |    7 ++++++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed559e2..ba1af2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-18  Rafael Espindola  <address@hidden>
+
+       * config-ml.in: don't handle --enable-shared and --enable-static.
+
 2008-06-06  Ralf Wildenhues  <address@hidden>
 
        * doc/automake.texi (Extending): Fix ambivalent wording.
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


hooks/post-receive
--
GNU Automake