From 66c40e84fe1514c71e043b139cebcb45616a2854 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Tue, 25 Feb 2014 20:44:22 +0100
Subject: Updated configure script to support non-x86 platforms

Signed-off-by: Haru <haru@dotalux.com>
---
 configure    | 38 +++++++++++++++++++++++++++++++++++++-
 configure.in | 21 +++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index a0cf9ecad..16bb8a738 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in 284a163.
+# From configure.in 8801585.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -4867,8 +4867,44 @@ if ac_fn_c_try_run "$LINENO"; then :
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -march=i686 (and we can run it)" >&5
+$as_echo_n "checking whether $CC supports -march=i686 (and we can run it)... " >&6; }
+		OLD_CFLAGS="$CFLAGS"
+		OLD_LDFLAGS="$LDFLAGS"
 		CFLAGS="$CFLAGS -march=i686"
 		LDFLAGS="$LDFLAGS -march=i686"
+		if test "$cross_compiling" = yes; then :
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: guessing no" >&5
+$as_echo "guessing no" >&6; }
+				CFLAGS="$OLD_CFLAGS"
+				LDFLAGS="$OLD_LDFLAGS"
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+				int main(int argc, char **argv) { return 0; }
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+				CFLAGS="$OLD_CFLAGS"
+				LDFLAGS="$OLD_LDFLAGS"
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
 
 else
 
diff --git a/configure.in b/configure.in
index 1fc2d0e29..6755e3ca5 100644
--- a/configure.in
+++ b/configure.in
@@ -481,8 +481,29 @@ AC_RUN_IFELSE(
 	])],
 	[
 		AC_MSG_RESULT([yes])
+		AC_MSG_CHECKING([whether $CC supports -march=i686 (and we can run it)])
+		OLD_CFLAGS="$CFLAGS"
+		OLD_LDFLAGS="$LDFLAGS"
 		CFLAGS="$CFLAGS -march=i686"
 		LDFLAGS="$LDFLAGS -march=i686"
+		AC_RUN_IFELSE(
+			[AC_LANG_SOURCE([
+				int main(int argc, char **argv) { return 0; }
+			])],
+			[
+				AC_MSG_RESULT([yes])
+			],
+			[
+				AC_MSG_RESULT([no])
+				CFLAGS="$OLD_CFLAGS"
+				LDFLAGS="$OLD_LDFLAGS"
+			],
+			[
+				AC_MSG_RESULT([guessing no])
+				CFLAGS="$OLD_CFLAGS"
+				LDFLAGS="$OLD_LDFLAGS"
+			]
+		)
 	],
 	[
 		AC_MSG_RESULT([no])
-- 
cgit v1.2.3-60-g2f50