[PATCH] configure: Fold ARCH_I686 into ARCH_I586

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

We have no use case for telling both apart.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---
configure.ac | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 15d9de6..fecce6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,18 +82,13 @@ AC_SUBST(GNUEFI_LIB_DIR)
AC_DEFINE_UNQUOTED(GNUEFI_LIB_DIR, ["$GNUEFI_LIB_DIR"], [The lib directory for gnuefi])

dnl Define ARCH_<NAME> conditionals
-SET_ARCH(I586, i586*)
-SET_ARCH(I686, i686*)
+SET_ARCH(I586, i586*|i686*)
SET_ARCH(X86_64, x86_64*)
SET_ARCH(IA64, ia64*)
SET_ARCH(AARCH64, aarch64*)

ARCH=$(echo $host | sed "s/\(-\).*$//")

-AM_COND_IF(ARCH_I686, [
- ARCH=ia32
- MACHINE_TYPE_NAME=ia32])
-
AM_COND_IF(ARCH_I586, [
ARCH=ia32
MACHINE_TYPE_NAME=ia32])
--
2.34.1