X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=m4%2Fmingw.m4;h=c4d0434a6933651ed8ffc337621596437ace422e;hb=b9e9d6ddd0438ec3e2ce30e88629f80da0d224ed;hp=f80c4d2cfb7d3751378216ac56e9c26fb3891ab6;hpb=9d0d6faa7d997645a9474d1e014d7b040fe41267;p=swftools.git

diff --git a/m4/mingw.m4 b/m4/mingw.m4
index f80c4d2..c4d0434 100644
--- a/m4/mingw.m4
+++ b/m4/mingw.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(RFX_CHECK_MING,
+AC_DEFUN([RFX_CHECK_MING],
 [
 AC_CANONICAL_HOST
 AC_EXEEXT
@@ -12,33 +12,43 @@ 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)
 
 dnl Checks for system services
 
 if test "x${CYGWIN}" = "xyes"; then
-    AC_DEFINE_UNQUOTED(CYGWIN, 1)
+    AC_DEFINE([CYGWIN], [1], [Define on cygwin])
     AC_MSG_RESULT(cygwin)
 else
     if test "x${MINGW}" = "xyes"; then
-	AC_DEFINE_UNQUOTED(MINGW, 1)
+	AC_DEFINE([MINGW], [1], [Define on Mingw])
 	WIN32=1
-	AC_DEFINE_UNQUOTED(WIN32, 1)
-	LIBS="$LIBS -lws2_32"
-	AC_MSG_RESULT(mingw)
+	AC_DEFINE([WIN32], [1], [Define on windows])
+	LIBS="$LIBS -lws2_32 -lgdi32"
+	AC_MSG_RESULT([mingw])
     else
 	LINUX=1
 	export LINUX
-	AC_DEFINE_UNQUOTED(LINUX, 1)
+	AC_DEFINE([LINUX], [1], [Define if not on cygwin or mingw])
 	AC_MSG_RESULT()
     fi
 fi