[SCM] GNU Libtool branch, master, updated. v2.2.6-147-g3a4f0d3

[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, master has been updated
       via  3a4f0d3958890c6d3ac1ff626b17586845d262bb (commit)
      from  b03736353b6d478a68bfc19c017605eb21a3edce (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

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

diff --git a/ChangeLog b/ChangeLog
index d3e924f..a12d764 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 662a88b..bebce6b 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -2989,7 +2989,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