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

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 2cdfd4d719c727e2dbb1cb213db652a63143e074
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=2cdfd4d719c727e2dbb1cb213db652a63143e074

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Sat Feb 18 15:03:51 2006 +0100

configure: Fix previous change to still build all the binaries on
x86_64 in 32-bit mode.

---

 configure    |   23 ++++++++++++++---------
 configure.ac |   19 ++++++++++++-------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/configure b/configure
index b966c82..7a16ba1 100755
--- a/configure
+++ b/configure
@@ -13115,18 +13115,23 @@ case $host_os in
     ;;
 esac
 
-case $host in
-  *i[3456789]86*-linux* | *i[3456789]86*-k*bsd*-gnu)
-    MAIN_BINARY="wine-glibc"
-
-    EXTRA_BINARIES="wine-kthread wine-pthread wine-preloader"
+case $host_cpu in
+  *i[3456789]86*)
+    case $host_os in
+      linux* | k*bsd*-gnu)
+        MAIN_BINARY="wine-glibc"
 
-    ;;
-  darwin*)          MAIN_BINARY="wine-pthread"
+        EXTRA_BINARIES="wine-kthread wine-pthread wine-preloader"
  ;;
-  *i[3456789]86*) MAIN_BINARY="wine-kthread"
+      darwin*)
+        MAIN_BINARY="wine-pthread"
  ;;
-  *)                MAIN_BINARY="wine-pthread"
+      *)
+        MAIN_BINARY="wine-kthread"
+ ;;
+    esac
+    ;;
+  *) 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 @@ case $host_os in
     ;;
 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 ****