From eae0dc23abed151196bc1488608bc1a96b289a00 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 1 Jan 2007 13:14:21 +0100
Subject: [PATCH] configure: Added a generic macro for checking for Mingw
 programs.

---
 aclocal.m4   | 12 ++++++++++++
 configure.ac |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 82fb19db683..32163fb02f2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -131,6 +131,18 @@ else
 fi
 rm -f conf$$ conf$$.file])
 
+dnl **** Check for a mingw program, trying the various mingw prefixes ****
+dnl
+dnl Usage: WINE_CHECK_MINGW_PROG(variable,prog,[value-if-not-found],[path])
+dnl
+AC_DEFUN([WINE_CHECK_MINGW_PROG],
+[AC_CHECK_PROGS([$1],
+   m4_foreach([ac_wine_prefix],
+              [i586-mingw32msvc, i386-mingw32msvc, i386-mingw32, mingw32, mingw],
+              [ac_wine_prefix-$2 ]),
+   [$3],[$4])])
+
+
 dnl **** Create nonexistent directories from config.status ****
 dnl
 dnl Usage: WINE_CONFIG_EXTRA_DIR(dirname)
diff --git a/configure.ac b/configure.ac
index d56250f9a93..92552d355bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1101,9 +1101,9 @@ case $host_os in
     AC_SUBST(CROSSTEST,"")
     if test "$cross_compiling" = "no"
     then
-      AC_CHECK_PROGS(CROSSCC,i586-mingw32msvc-gcc i386-mingw32msvc-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc,false)
-      AC_CHECK_PROGS(DLLTOOL,i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool,false)
-      AC_CHECK_PROGS(CROSSWINDRES,i586-mingw32msvc-windres i386-mingw32msvc-windres i386-mingw32-windres mingw32-windres mingw-windres,false)
+      WINE_CHECK_MINGW_PROG(CROSSCC,gcc,false)
+      WINE_CHECK_MINGW_PROG(DLLTOOL,dlltool,false)
+      WINE_CHECK_MINGW_PROG(CROSSWINDRES,windres,false)
       if test "$CROSSCC" != "false"; then CROSSTEST="\$(CROSSTEST)"; fi
     fi
     ;;