configure: Fix previous change to still build all the binaries on

configure

@@ -13115,16 +13115,21 @@ case $host_os in
     ;;
 esac
 
-case $host in
-  *i[3456789]86*-linux* | *i[3456789]86*-k*bsd*-gnu)
+case $host_cpu in
+  *i[3456789]86*)
+    case $host_os in
+      linux* | k*bsd*-gnu)
         MAIN_BINARY="wine-glibc"
 
         EXTRA_BINARIES="wine-kthread wine-pthread wine-preloader"
-
  ;;
-  darwin*)          MAIN_BINARY="wine-pthread"
+      darwin*)
+        MAIN_BINARY="wine-pthread"
  ;;
-  *i[3456789]86*) MAIN_BINARY="wine-kthread"
+      *)
+        MAIN_BINARY="wine-kthread"
+ ;;
+    esac
     ;;
   *) MAIN_BINARY="wine-pthread"
  ;;

configure.ac

@@ -1081,13 +1081,18 @@ case $host_os in
     ;;
 esac
 
-case $host in
-  *i[[3456789]]86*-linux* | *i[[3456789]]86*-k*bsd*-gnu)
+case $host_cpu in
+  *i[[3456789]]86*)
+    case $host_os in
+      linux* | k*bsd*-gnu)
         AC_SUBST(MAIN_BINARY,"wine-glibc")
-    AC_SUBST(EXTRA_BINARIES,"wine-kthread wine-pthread wine-preloader")
+        AC_SUBST(EXTRA_BINARIES,"wine-kthread wine-pthread wine-preloader") ;;
+      darwin*)
+        AC_SUBST(MAIN_BINARY,"wine-pthread") ;;
+      *)
+        AC_SUBST(MAIN_BINARY,"wine-kthread") ;;
+    esac
     ;;
-  darwin*)          AC_SUBST(MAIN_BINARY,"wine-pthread") ;;
-  *i[[3456789]]86*) AC_SUBST(MAIN_BINARY,"wine-kthread") ;;
   *) AC_SUBST(MAIN_BINARY,"wine-pthread") ;;
 esac