bugfixes

[swftools.git] / m4 / mingw.m4

diff --git a/m4/mingw.m4 b/m4/mingw.m4
index f80c4d2..3486ba4 100644 (file)
--- a/m4/mingw.m4
+++ b/m4/mingw.m4
@@ -12,14 +12,24 @@ case $host_os in
 esac
 
 AR=ar
-if test "x$CXX" == "xi586-mingw32msvc-g++"; then
-#fix for the debian distribution of mingw
+if test "x$MINGW" = "xyes"; then
+    #fix for the debian distribution of mingw
     if test -x "/usr/i586-mingw32msvc/bin/ar";then
        AR="/usr/i586-mingw32msvc/bin/ar"
     fi
     if test -x "/usr/i586-mingw32msvc/bin/ranlib";then
        RANLIB="/usr/i586-mingw32msvc/bin/ranlib"
     fi
+    #fix for the gentoo distribution of mingw
+    if test -x "/opt/xmingw/bin/i386-mingw32msvc-ar";then
+       AR="/opt/xmingw/bin/i386-mingw32msvc-ar"
+    fi
+    if test -x "/opt/xmingw/bin/i386-mingw32msvc-ranlib";then
+       RANLIB="/opt/xmingw/bin/i386-mingw32msvc-ranlib"
+    fi
+    if test -x "/opt/xmingw/bin/i386-mingw32msvc-strip";then
+       STRIP="/opt/xmingw/bin/i386-mingw32msvc-strip"
+    fi
 fi
 AC_SUBST(AR)
 
@@ -33,7 +43,7 @@ else
        AC_DEFINE_UNQUOTED(MINGW, 1)
        WIN32=1
        AC_DEFINE_UNQUOTED(WIN32, 1)
-       LIBS="$LIBS -lws2_32"
+       LIBS="$LIBS -lws2_32 -lgdi32"
        AC_MSG_RESULT(mingw)
     else
        LINUX=1