# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1348631383 25200
# Node ID df49d3db1cb9a2ed02055bd7b19f1ce9273c7c43
# Parent  bdfafea99872635d40df1a6ba5f066640636dd22# Parent  f67fcade4e1ce42b5a75892bc77a6d1b2de2024c
Merged libtool fixes

diff -r bdfafea99872 -r df49d3db1cb9 aclocal.m4
--- a/aclocal.m4	Tue Sep 25 20:49:29 2012 -0700
+++ b/aclocal.m4	Tue Sep 25 20:49:43 2012 -0700
@@ -3899,6 +3899,7 @@
   # func_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='func_win32_libid'
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
 mingw* | pw32*)
@@ -3914,6 +3915,7 @@
     lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
 cegcc*)
diff -r bdfafea99872 -r df49d3db1cb9 configure
--- a/configure	Tue Sep 25 20:49:29 2012 -0700
+++ b/configure	Tue Sep 25 20:49:43 2012 -0700
@@ -4877,6 +4877,7 @@
   # func_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='func_win32_libid'
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
 mingw* | pw32*)
@@ -4892,6 +4893,7 @@
     lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
 cegcc*)
diff -r bdfafea99872 -r df49d3db1cb9 test/test-automation/acinclude/libtool.m4
--- a/test/test-automation/acinclude/libtool.m4	Tue Sep 25 20:49:29 2012 -0700
+++ b/test/test-automation/acinclude/libtool.m4	Tue Sep 25 20:49:43 2012 -0700
@@ -2993,6 +2993,7 @@
   # func_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='func_win32_libid'
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
 mingw* | pw32*)
@@ -3006,6 +3007,7 @@
     lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
 cegcc)