[SCM] GNU Libtool branch, pr-msvc-support, updated. v2.2.6-184-g158ac15

[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 Libtool".

The branch, pr-msvc-support has been updated
       via  158ac1566d248296e4ddcd39fee6743b7ba3a07e (commit)
       via  3a4f0d3958890c6d3ac1ff626b17586845d262bb (commit)
      from  dd42e63ce688302500f349606c55bf173feda3a4 (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 158ac1566d248296e4ddcd39fee6743b7ba3a07e
Merge: dd42e63ce688302500f349606c55bf173feda3a4 
3a4f0d3958890c6d3ac1ff626b17586845d262bb
Author: Peter Rosin <address@hidden>
Date:   Fri Sep 11 06:40:30 2009 +0200

    Merge branch 'master' into pr-msvc-support

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

Summary of changes:
 ChangeLog             |    7 +++++++
 libltdl/m4/libtool.m4 |    3 ++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d88355d..59892b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-10  Peter Rosin  <address@hidden>
+
+       func_win32_libid doesn't work with MS dumpbin
+       * libltdl/m4/libtool.m4 (_LT_CHECK_MAGIC_METHOD): The $NM
+       interface is assumed to be BSD nm in func_win32_libid, so
+       check for that before using it.
+
 2009-09-07  Ralf Wildenhues  <address@hidden>
 
        Allow dlopen self test to work with gcc's -fvisibility=hidden.
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 1a2d7d4..861e21a 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -3088,7 +3088,8 @@ mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
   # func_win32_libid shell function, so use a weaker test based on 'objdump',
   # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else


hooks/post-receive
-- 
GNU Libtool