From 0d4e2f95e628b693e418ac9825e81792acf9d809 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 31 Jan 2024 17:47:08 -0800
Subject: [PATCH] Fix configure tests for multi-arch libaltos

libaltos builds now require a long list of compilers. Check for all of them
before enabling it when building in auto mode.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 configure.ac | 39 ++++++++++-----------------------------
 1 file changed, 10 insertions(+), 29 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3cfbc64d..9e3db494 100644
--- a/configure.ac
+++ b/configure.ac
@@ -475,39 +475,20 @@ AC_ARG_ENABLE([multi-arch],
 
 case x"$MULTI_ARCH" in
 xauto)
-	arch=`uname -m`
-	case x"$arch" in
-	xx86_64|xi*86)
-		save_CFLAGS="$CFLAGS"
-		save_LIBS="$LIBS"
-		LIBS="-ldl"
-		CFLAGS="-m64"
-		AC_MSG_CHECKING([if ]$CC[ ]$CFLAGS[ can link programs])
-		AC_LINK_IFELSE([AC_LANG_PROGRAM([])],
-				[M64_LINK=yes],
-				[M64_LINK=no])
-		AC_MSG_RESULT([$M64_LINK])
-		CFLAGS="-m32"
-		AC_MSG_CHECKING([if ]$CC[ ]$CFLAGS[ can link programs])
-		AC_LINK_IFELSE([AC_LANG_PROGRAM([])],
-				[M32_LINK=yes],
-				[M32_LINK=no])
-		AC_MSG_RESULT([$M32_LINK])
-		CFLAGS="$save_CFLAGS"
-		LIBS="$save_LIBS"
-		case x"$M64_LINK"x"$M32_LINK" in
-		xyesxyes)
-			MULTI_ARCH=yes
+	MULTI_ARCH=yes
+	for arch in i686-linux-gnu x86_64-linux-gnu aarch64-linux-gnu arm-linux-gnueabi arm-linux-gnueabihf; do
+		crossgcc="$arch"-gcc
+		AC_CHECK_PROG(ARCH_SUPPORTED,$crossgcc,yes,no)
+		case "$ARCH_SUPPORTED" in
+		yes)
 			;;
 		*)
 			MULTI_ARCH=no
 			;;
 		esac
-		;;
-	*)
-		MULTI_ARCH=no
-		;;
-	esac
+	done
+	AC_MSG_CHECKING([MULTI_ARCH])
+	AC_MSG_RESULT([$MULTI_ARCH])
 	;;
 xyes|xno)
 	;;
@@ -595,7 +576,7 @@ echo "    AVR support.................: ${HAVE_AVR_CC}"
 echo "    Android support.............: ${HAVE_ANDROID_SDK}"
 echo "    Android release support.....: ${ANDROID_RELEASE}"
 echo "    STlink support..............: ${HAVE_STLINK}"
-echo "    i386 and amd64 libaltos.....: ${MULTI_ARCH}"
+echo "    multi-arch libaltos.........: ${MULTI_ARCH}"
 echo "    install shared mime info....: ${INSTALL_SHARED_MIME_INFO}"
 echo "    Strip jar timestamps........: ${STRIP_NONDETERMINISM}"
 echo ""
-- 
2.30.2