From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
Date: Fri, 17 Oct 2003 03:57:34 +0000 (+0000)
Subject: * libtool.m4 (AC_DEPLIBS_CHECK_METHOD): For MinGW, reverted DLL
X-Git-Tag: release-1-5-2~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e137687b48763d42098a42cf67fd155b6589878;p=thirdparty%2Flibtool.git

* 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 58e4e8f6b..f5230a10e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-16  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+	* 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-09-29  Scott James Remnant  <scott@netsplit.com>
 
 	* libtool.m4 (AC_DEPLIBS_CHECK_METHOD): Use pass_all for linux*
diff --git a/libtool.m4 b/libtool.m4
index 84492cd86..21ca9215b 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -2117,12 +2117,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'
   ;;
 
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # win32_libid shell function, so use a weaker test based on 'objdump'.
+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
 darwin* | rhapsody*)
   # this will be overwritten by pass_all, but leave it in just in case
   lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'