From 6f5dcb825570e6a40c578fc96646bf1bf17826df Mon Sep 17 00:00:00 2001 From: Gabriel Jacobo Date: Tue, 25 Sep 2012 08:54:05 -0300 Subject: [PATCH] Fix Windows build, version.o linking. --- aclocal.m4 | 2 ++ configure | 2 ++ test/test-automation/acinclude/libtool.m4 | 2 ++ 3 files changed, 6 insertions(+) diff --git a/aclocal.m4 b/aclocal.m4 index a2d37e780..e05d16392 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -3899,6 +3899,7 @@ cygwin*) # 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 @@ mingw* | pw32*) 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 --git a/configure b/configure index 9123a14fc..90c878559 100755 --- a/configure +++ b/configure @@ -4877,6 +4877,7 @@ cygwin*) # 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 @@ mingw* | pw32*) 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 --git a/test/test-automation/acinclude/libtool.m4 b/test/test-automation/acinclude/libtool.m4 index 39ba996cb..6edf0391b 100644 --- a/test/test-automation/acinclude/libtool.m4 +++ b/test/test-automation/acinclude/libtool.m4 @@ -2993,6 +2993,7 @@ cygwin*) # 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 @@ mingw* | pw32*) 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)