From b18d76a1c45dd14417d2ba06b4e69e534984ba3f Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Fri, 30 Mar 2012 22:52:09 +0200
Subject: [PATCH] configure fixes.

1) use " instead of ' to expand variable
2) fix x86 arch autodetection (android toolchain doesnt use _X86_)

Change-Id: Ibf73b6ccfdb1baee3bb2f77d8f298119ecbfe16c
---
 tools/configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/configure b/tools/configure
index a7076236d0..b682cbd223 100755
--- a/tools/configure
+++ b/tools/configure
@@ -237,7 +237,7 @@ simcc () {
 
  GCCOPTS="$GCCOPTS -fno-builtin -g"
  GCCOPTIMIZE=''
- LDOPTS='$LDOPTS -lm' # button-sdl.c uses sqrt()
+ LDOPTS="$LDOPTS -lm" # button-sdl.c uses sqrt()
  sigaltstack=""
  fibers=""
  endian="" # endianess of the dap doesnt matter here
@@ -3686,7 +3686,7 @@ if [ -z "$arch" ]; then
         arch_version="$(echo $cpp_defines | sed s,\ ,\\n,g | grep __ARM_ARCH | sed -e 's,.*\([0-9]\).*,\1,')"
     elif [ -n "$(echo $cpp_defines | grep -w __mips__)" ]; then
         arch="mips" # FIXME: autodetect version (32 or 64)
-    elif [ -n "$(echo $cpp_defines | grep -w _X86_)" ]; then
+    elif [ -n "$(echo $cpp_defines | grep -w __i386__)" ]; then
         arch="x86"
     elif [ -n "$(echo $cpp_defines | grep -w __x86_64__)" ]; then
         arch="amd64"