* m4/libtool.m4 (AC_DEPLIBS_CHECK_METHOD): For MinGW, reverted DLL

check method back to a working objdump-based test.  This is not as
concrete a test as using the 'file' command, but it does not
require that the 'file' command be available.

diff --git a/ChangeLog b/ChangeLog
index 37bc45dbab63cf5e5d8c25bcc282f77c70b8cfa2..e76107475ad97ce0ce63aae56b49a580d96b9b33 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-16  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+       * m4/libtool.m4 (AC_DEPLIBS_CHECK_METHOD): For MinGW, reverted DLL
+       check method back to a working objdump-based test.  This is not as
+       concrete a test as using the 'file' command, but it does not
+       require that the 'file' command be available.
+
 2003-10-15  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
        * doc/libtool.texi (AC_LIBTOOL_TAGS): Incorporate documentation

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index c47e2d09f3160047234d6e92959d853d58e3ba0d..d792953cdc4345763ba04ec00114088813a5963e 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2063,12 +2063,19 @@ bsdi4*)
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
-cygwin* | mingw* | pw32*)
+cygwin*)
   # win32_libid is a shell function defined in ltmain.sh
   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
   lt_cv_file_magic_cmd='win32_libid'
   ;;
 
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # win32_libid shell function, so use a weaker test based on 'objdump'.
+mingw* | pw32*)
+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
 darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;