configure: Fix previous change to still build all the binaries on
x86_64 in 32-bit mode.
diff --git a/configure b/configure
index b966c82..7a16ba1 100755
--- a/configure
+++ b/configure
@@ -13115,18 +13115,23 @@
;;
esac
-case $host in
- *i[3456789]86*-linux* | *i[3456789]86*-k*bsd*-gnu)
- MAIN_BINARY="wine-glibc"
+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"
-
+ EXTRA_BINARIES="wine-kthread wine-pthread wine-preloader"
+ ;;
+ darwin*)
+ MAIN_BINARY="wine-pthread"
+ ;;
+ *)
+ MAIN_BINARY="wine-kthread"
+ ;;
+ esac
;;
- darwin*) MAIN_BINARY="wine-pthread"
- ;;
- *i[3456789]86*) MAIN_BINARY="wine-kthread"
- ;;
- *) MAIN_BINARY="wine-pthread"
+ *) MAIN_BINARY="wine-pthread"
;;
esac
diff --git a/configure.ac b/configure.ac
index 582df4d..be2d693 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1081,14 +1081,19 @@
;;
esac
-case $host in
- *i[[3456789]]86*-linux* | *i[[3456789]]86*-k*bsd*-gnu)
- AC_SUBST(MAIN_BINARY,"wine-glibc")
- AC_SUBST(EXTRA_BINARIES,"wine-kthread wine-pthread wine-preloader")
+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") ;;
+ 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") ;;
+ *) AC_SUBST(MAIN_BINARY,"wine-pthread") ;;
esac
dnl **** Get the soname for libraries that we load dynamically ****
