aclocal: Detect the mingw variant named amd64-mingw32msvc.

d2103751 · Vincent Povirk · Alexandre Julliard · 112f8789 · d2103751 · d2103751
Commit d2103751 authored Oct 11, 2010 by Vincent Povirk Committed by Alexandre Julliard Oct 12, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

aclocal.m4 aclocal.m4 +2 -1

configure configure +1 -1

No files found.
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -128,7 +128,8 @@ AC_DEFUN([WINE_CHECK_MINGW_PROG],
    ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, mingw32msvc, mingw32],
                        m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;;
  x86_64)
-    ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32,w64-mingw32],[x86_64-ac_wine_prefix-$2 ])" ;;
+    ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, w64-mingw32, mingw32msvc],
+                        m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;;
  *)
    ac_prefix_list="" ;;
 esac

--- a/configure
+++ b/configure
@@ -7018,7 +7018,7 @@ then
  i[3456789]86*)
    ac_prefix_list="i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc " ;;
  x86_64)
-    ac_prefix_list="x86_64-pc-mingw32-gcc x86_64-w64-mingw32-gcc " ;;
+    ac_prefix_list="x86_64-pc-mingw32-gcc amd64-pc-mingw32-gcc x86_64-w64-mingw32-gcc amd64-w64-mingw32-gcc x86_64-mingw32msvc-gcc amd64-mingw32msvc-gcc " ;;
  *)
    ac_prefix_list="" ;;
 esac