[Libreoffice-commits] .: 2 commits - configure.in external/wine

[Tor Lillqvist]

 configure.in              |    6 ++++--
 external/wine/makefile.mk |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 7188a117be8ce2916f7fd9e85a4aa1ed6ff36f83
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 30 13:50:34 2011 +0300

    Use --kill-at

diff --git a/external/wine/makefile.mk b/external/wine/makefile.mk
index 21399e5..f70e182 100644
--- a/external/wine/makefile.mk
+++ b/external/wine/makefile.mk
@@ -34,7 +34,7 @@ TARGET=gdiplus
 ALL:
     -$(MKDIRHIER) $(OUT)/inc/wine
     cp include/* $(OUT)/inc/wine
-    for L in gdiplus msi urlmon; do $(DLLTOOL) --input-def lib/$$L.def --dllname=$$L.dll --output-lib=$(OUT)/lib/lib$$L.dll.a; done
+    for L in gdiplus msi urlmon; do $(DLLTOOL) --kill-at --input-def lib/$$L.def --dllname=$$L.dll --output-lib=$(OUT)/lib/lib$$L.dll.a; done
 .ENDIF
 
 .INCLUDE :  target.mk
commit 48cc828b1f8c49b7dcf45149d3e5726213c64ea2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 30 13:37:58 2011 +0300

    Don't error out if we can't detect shared MinGW libgcc and libstdc++
    
    It might be a false negative, or something.

diff --git a/configure.in b/configure.in
index 286bcca..b2500b2 100755
--- a/configure.in
+++ b/configure.in
@@ -3218,7 +3218,8 @@ using namespace std;
                 MINGW_SHARED_GCCLIB=YES
                 AC_MSG_RESULT([ $MINGW_GCCDLL])
             else
-                AC_MSG_ERROR([no])
+                MINGW_SHARED_GCCLIB=NO
+                AC_MSG_RESULT([no])
             fi
        ],
        [ AC_MSG_RESULT([no])
@@ -3240,7 +3241,8 @@ using namespace std;
                 MINGW_SHARED_GXXLIB=YES
                 AC_MSG_RESULT([$MINGW_GXXDLL])
             else
-                AC_MSG_ERROR([no])
+                MINGW_SHARED_GXXLIB=NO
+                AC_MSG_RESULT([no])
             fi
        ],
        [ AC_MSG_RESULT([no])