[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-154-g0c63a75

[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=0c63a75dfb79ae53a0cd5c1f5889dc3e7126e899

The branch, master has been updated
       via  0c63a75dfb79ae53a0cd5c1f5889dc3e7126e899 (commit)
      from  24abcf7fe42b7a6a03f10289643d818eae7e7951 (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 0c63a75dfb79ae53a0cd5c1f5889dc3e7126e899
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 9fd8d92..cfc19a4 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-18  Ralf Wildenhues  <address@hidden>
 
        * lib/am/inst-vars.am (am__install_max): New variable.
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