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.

Signed-off-by: Peter Rosin <peda@lysator.liu.se>

diff --git a/ChangeLog b/ChangeLog
index d3e924fee744e0c5a3710c611f0e5098d4f9cf62..a12d7644075f0116738df7c485375fbab4cca403 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-10  Peter Rosin  <peda@lysator.liu.se>
+
+       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  <Ralf.Wildenhues@gmx.de>
 
        Allow dlopen self test to work with gcc's -fvisibility=hidden.

diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 662a88b12abd61b6b3d277fadf045226874d37e8..bebce6b66859eed1bb9703103b55185acc5ed369 100644 (file)
--- 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