From 2cdfd4d719c727e2dbb1cb213db652a63143e074 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 18 Feb 2006 15:03:51 +0100 Subject: [PATCH] configure: Fix previous change to still build all the binaries on x86_64 in 32-bit mode. --- configure | 25 +++++++++++++++---------- configure.ac | 19 ++++++++++++------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/configure b/configure index b966c8253d5..7a16ba1a90e 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" + 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 582df4da62b..be2d693a9b1 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 ****