configure: use $host_cpu where applicable

(cherry picked from commit a50366bc9702ad4ec0db1e5361bcea8378bf8132)

Gbp-Pq: Name 0097-configure-use-host_cpu-where-applicable.patch

diff --git a/configure.ac b/configure.ac
index 079a00df8889de53827d93fe43c0fda1e208bc49..f328bc036988d3b06d10b7c4bd649c27c879678a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -145,8 +145,8 @@ case "${host_os}" in
 
     dnl Force gcc "-arch" flag
     ARCH_flag=""
-    case "${host}" in
-      i?86*)
+    case "${host_cpu}" in
+      i?86)
         ARCH_flag="-arch i386"
       ;;
       ppc64*)
@@ -155,7 +155,7 @@ case "${host_os}" in
       ppc*)
         ARCH_flag="-arch ppc"
       ;;
-      x86_64*)
+      x86_64)
         ARCH_flag="-arch x86_64"
       ;;
       arm*)
@@ -286,8 +286,8 @@ case "${host_os}" in
         dnl
         dnl NSIS/MSI Installer prefix and WIN64
         dnl
-        case "${host}" in
-            amd64*|x86_64*)
+        case "${host_cpu}" in
+            amd64|x86_64)
                 HAVE_WIN64="1"
                 WINDOWS_ARCH="x64"
                 PROGRAMFILES="PROGRAMFILES64"