[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-311-g09cbcbb

[Peter Rosin]

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=09cbcbb33ae6eb9f72b1857931f4b3879df92514

The branch, master has been updated
       via  09cbcbb33ae6eb9f72b1857931f4b3879df92514 (commit)
       via  8c406f64b66aedee8359ddf1383e087faa2ba233 (commit)
      from  16fef95d4a990935f8257cb89df0d36846d1179b (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 09cbcbb33ae6eb9f72b1857931f4b3879df92514
Merge: 16fef95 8c406f6
Author: Peter Rosin <address@hidden>
Date:   Fri Aug 13 08:23:44 2010 +0200

    Merge branch 'msvc'

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

Summary of changes:
 ChangeLog         |    8 ++++++++
 lib/ar-lib        |   26 +++++++++++++++++++++++---
 tests/ar-lib.test |    4 ++++
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3f668bc..9ba4851 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-12  Peter Rosin  <address@hidden>
+
+       Enable the use of "link -lib" as the wrapped archiver.
+       * lib/ar-lib: Enable the use of "link -lib" as the wrapped
+       archiver, as well as allowing some other options to be passed
+       through to the wrapped archiver.
+       * tests/ar-lib.test: Test the above.
+
 2010-08-10  Stefano Lattarini  <address@hidden>
 
        Tweak and/or extend some `acloca*.test' tests.
diff --git a/lib/ar-lib b/lib/ar-lib
index aa4acbd..ef03430 100755
--- a/lib/ar-lib
+++ b/lib/ar-lib
@@ -2,7 +2,7 @@
 # Wrapper for Microsoft lib.exe
 
 me=ar-lib
-scriptversion=2010-08-08.07; # UTC
+scriptversion=2010-08-12.16; # UTC
 
 # Copyright (C) 2010 Free Software
 # Foundation, Inc.
@@ -121,8 +121,28 @@ fi
 
 AR=$1
 shift
-action=$1
-shift
+while :
+do
+  if test $# -lt 2; then
+    func_error "you must specify a program, an action and an archive"
+  fi
+  case $1 in
+    -lib | -LIB \
+    | -ltcg | -LTCG \
+    | -machine* | -MACHINE* \
+    | -subsystem* | -SUBSYSTEM* \
+    | -verbose | -VERBOSE \
+    | -wx* | -WX* )
+      AR="$AR $1"
+      shift
+      ;;
+    *)
+      action=$1
+      shift
+      break
+      ;;
+  esac
+done
 orig_archive=$1
 shift
 func_file_conv "$orig_archive"
diff --git a/tests/ar-lib.test b/tests/ar-lib.test
index 85f8242..d418c21 100755
--- a/tests/ar-lib.test
+++ b/tests/ar-lib.test
@@ -72,4 +72,8 @@ test x"$opts" = x"lib -NOLOGO -EXTRACT:foo.obj foo.lib"
 opts=`./ar-lib ./lib x foo.lib @foolist`
 test x"$opts" = x"lib -NOLOGO -EXTRACT:foo.obj foo.lib"
 
+# Check if ar-lib passes -lib and -LTCG through to the wrappee
+opts=`./ar-lib ./lib -lib -LTCG x foo.lib foo.obj`
+test x"$opts" = x"lib -lib -LTCG -NOLOGO -EXTRACT:foo.obj foo.lib"
+
 :


hooks/post-receive
-- 
GNU Automake