[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.3-27-g3c5c939

[Stefano Lattarini]

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=3c5c9394e2cbe6f88e0117f34c33b1e03cdaa5bb

The branch, maint has been updated
       via  3c5c9394e2cbe6f88e0117f34c33b1e03cdaa5bb (commit)
       via  ae74aa69705e967a19327c70a26c0004843e8e7b (commit)
       via  6a0460c49f401a58a9ffff1e65690da90690c002 (commit)
      from  b8651afd8279a6eb86648b08579776eec368f8fb (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 3c5c9394e2cbe6f88e0117f34c33b1e03cdaa5bb
Author: Peter Rosin <address@hidden>
Date:   Thu Oct 4 00:08:26 2012 +0200

    compile: support libfoo.a naming when wrapping Microsoft tools
    
    There is a future plan to provide some means to have Automake
    create static libraries that are named differently depending
    on the system [1].
    
    The background is that everyone has always named static libraries
    libfoo.a, except the Redmond crowd who names them foo.lib, and
    you have to jump through hoops to have Automake create libraries
    named foo.lib in the land of non-GNU Windows while still creating
    libfoo.a everywhere else.
    
    However, there is probably no sane way to accomplish that system
    dependent naming discussed in [1] without user intervention,
    which makes it necessary to support the classic libfoo.a naming
    when using Microsoft tools in the best possible way, for the
    benefit of all projects today and for future projects not
    opting in to whatever scheme is selected for the problem at
    hand.
    
    [1] http://lists.gnu.org/archive/html/automake/2012-09/msg00028.html
    
    * lib/compile (func_cl_dashl): As a last resort, match -lfoo with
    libfoo.a, if that file exist on the library search path.
    * t/compile4.sh: Remove obsolescent workaround for the above.
    * t/compile6.sh: Extend to check that libbaz.a is indeed found
    when baz.lib and baz.dll.lib does not exist and that bar.lib
    and bar.dll.lib are preferred over libbar.a.
    
    Signed-off-by: Peter Rosin <address@hidden>
    Signed-off-by: Stefano Lattarini <address@hidden>

commit ae74aa69705e967a19327c70a26c0004843e8e7b
Author: Stefano Lattarini <address@hidden>
Date:   Sun Oct 14 11:54:45 2012 +0200

    NEWS: fix wording and grammaros, re-wrap text accordingly
    
    Reported-by: Peter Rosin <address@hidden>
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 6a0460c49f401a58a9ffff1e65690da90690c002
Author: Paul Eggert <address@hidden>
Date:   Sun Oct 14 11:43:26 2012 +0200

    cosmetics: fix typo in 'lib/depcomp' comments
    
    Fixes automake bug#12578.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 NEWS          |   17 ++++++++---------
 lib/compile   |    7 ++++++-
 lib/depcomp   |    2 +-
 t/compile4.sh |    8 --------
 t/compile6.sh |   10 +++++++++-
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/NEWS b/NEWS
index d0bc122..4b50517 100644
--- a/NEWS
+++ b/NEWS
@@ -182,7 +182,7 @@ New in 1.12.1:
   - Use of the long-deprecated two- and three-arguments invocation forms
     of the AM_INIT_AUTOMAKE macro now elicits a warning in the 'obsolete'
     category.  Starting from some future major Automake release (likely
-    post-1.13), such usages will be no longer allowed.
+    post-1.13), such usages will no longer be allowed.
 
   - Support for the "Cygnus-style" trees (enabled by the 'cygnus' option) is
     now deprecated (its use triggers a warning in the 'obsolete' category).
@@ -196,13 +196,12 @@ New in 1.12.1:
 * Miscellaneous changes:
 
   - The Automake test cases now require a proper POSIX-conforming shell.
-    Older non-POSIX Bourne shells (like Solaris 10 /bin/sh) will be no
-    longer accepted.  In most cases, the user shouldn't have to specify
-    such POSIX shell explicitly, since it will be looked up at configure
-    time.  Still, when this lookup fails, or when the user wants to
-    override its conclusion, the variable 'AM_TEST_RUNNER_SHELL' can be
-    used (pointing to the shell that will be used to run the Automake
-    test cases).
+    Older non-POSIX Bourne shells (like Solaris 10 /bin/sh) will no longer
+    be accepted.  In most cases, the user shouldn't have to specify such
+    POSIX shell explicitly, since it will be looked up at configure time.
+    Still, when this lookup fails, or when the user wants to override its
+    conclusion, the variable 'AM_TEST_RUNNER_SHELL' can be used (pointing
+    to the shell that will be used to run the Automake test cases).
 
 Bugs fixed in 1.12.1:
 
@@ -573,7 +572,7 @@ Bugs fixed in 1.11.3:
   - Automake now correctly recognizes the prefix/primary combination
    'pkglibexec_SCRIPTS' as valid.
 
-  - The parallel-tests harness now doesn't trip on sed implementations
+  - The parallel-tests harness no longer trips on sed implementations
     with stricter limits on the length of input lines (problem seen at
     least on Solaris 8).
 
diff --git a/lib/compile b/lib/compile
index 7b4a9a7..718dc6d 100755
--- a/lib/compile
+++ b/lib/compile
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-03-05.13; # UTC
+scriptversion=2012-10-14.11; # UTC
 
 # Copyright (C) 1999-2012 Free Software Foundation, Inc.
 # Written by Tom Tromey <address@hidden>.
@@ -112,6 +112,11 @@ func_cl_dashl ()
       lib=$dir/$lib.lib
       break
     fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
   done
   IFS=$save_IFS
 
diff --git a/lib/depcomp b/lib/depcomp
index 0544c68..ee84bf2 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -108,7 +108,7 @@ if test "$depmode" = msvc7msys; then
 fi
 
 if test "$depmode" = xlc; then
-   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
    gccflag=-qmakedep=gcc,-MF
    depmode=gcc
 fi
diff --git a/t/compile4.sh b/t/compile4.sh
index 2e275a3..e5b5c57 100755
--- a/t/compile4.sh
+++ b/t/compile4.sh
@@ -70,14 +70,6 @@ $MAKE
 
 ./compile cl $CPPFLAGS $CFLAGS -c -o "$absmainobj" "$absmainc"
 
-# cl expects archives to be named foo.lib, not libfoo.a so
-# make a simple copy here if needed. This is a severe case
-# of badness, but ignore that since this is not what is
-# being tested here...
-if test -f sub/libfoo.a; then
-  cp sub/libfoo.a sub/foo.lib
-fi
-
 # POSIX mandates that the compiler accepts a space between the -I,
 # -l and -L options and their respective arguments.  Traditionally,
 # this should work also without a space.  Try both usages.
diff --git a/t/compile6.sh b/t/compile6.sh
index ee47c17..529f22c 100755
--- a/t/compile6.sh
+++ b/t/compile6.sh
@@ -47,6 +47,8 @@ for sp in '' ' '; do
   mkdir lib
   : > lib/bar.lib
   : > lib/bar.dll.lib
+  : > lib/libbar.a
+  : > lib/libbaz.a
 
   # Check if compile library search correctly
   opts=$(./compile ./cl foo.c -o foo -L${sp}lib -l${sp}bar -l${sp}foo)
@@ -58,6 +60,7 @@ for sp in '' ' '; do
 
   : > syslib/bar.lib
   : > syslib/bar.dll.lib
+  : > syslib/libbar.a
 
   # Check if compile finds bar.dll.lib in syslib
   opts=$(./compile ./cl foo.c -o foo -l${sp}bar -l${sp}foo)
@@ -67,6 +70,11 @@ for sp in '' ' '; do
   opts=$(./compile ./cl foo.c -o foo -L${sp}lib -l${sp}bar -l${sp}foo)
   test x"$opts" = x"foo.c -Fefoo lib/bar.dll.lib $syslib/foo.lib -link 
-LIBPATH:lib"
 
+  # Check if compile falls back to finding classic libname.a style libraries
+  # when name.lib or name.dll.lib isn't available.
+  opts=$(./compile ./cl foo.c -o foo -L${sp}lib -l${sp}baz)
+  test x"$opts" = x"foo.c -Fefoo lib/libbaz.a -link -LIBPATH:lib"
+
   mkdir lib2
   : > lib2/bar.dll.lib
 
@@ -93,7 +101,7 @@ for sp in '' ' '; do
   syslib2="$(pwd)/sys  lib2"
   LIB="$syslib2;$LIB"
 
-  # Check if compile handles spaces in $LIB and that it prefers the order
+  # Check if compile handles spaces in $LIB and that it obeys the order
   # in a multi-component $LIB.
   opts=$(./compile ./cl foo.c -o foo -l${sp}foo)
   test x"$opts" = x"foo.c -Fefoo $syslib2/foo.dll.lib"


hooks/post-receive
-- 
GNU Automake