From 97f4d811933e5c865f9bffd71b6ac7b12c449e94 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 4 May 2014 18:52:32 +0800
Subject: [PATCH] fix bug of mips

---
 trunk/auto/depends.sh |  4 ++--
 trunk/auto/options.sh |  9 ++++-----
 trunk/configure       | 12 ++++++------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh
index 2ba8cbc39..7684e118d 100755
--- a/trunk/auto/depends.sh
+++ b/trunk/auto/depends.sh
@@ -107,7 +107,7 @@ function Ubuntu_prepare()
     
     # for arm, install the cross build tool chain.
     if [ $SRS_ARM_UBUNTU12 = YES ]; then
-        `$SrsArmCC` --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
+        `$SrsArmCC --help` >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
             echo "install gcc-arm-linux-gnueabi g++-arm-linux-gnueabi"
             require_sudoer "sudo apt-get install -y --force-yes gcc-arm-linux-gnueabi g++-arm-linux-gnueabi"
             sudo apt-get install -y --force-yes gcc-arm-linux-gnueabi g++-arm-linux-gnueabi; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
@@ -117,7 +117,7 @@ function Ubuntu_prepare()
     
     # for mips, user must installed the tool chain.
     if [ $SRS_MIPS_UBUNTU12 = YES ]; then
-        `$SrsArmCC` --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
+        `$SrsArmCC --help` >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
             echo "user must install the tool chain: $SrsArmCC"
             return 2
         fi
diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh
index 2da1c4e89..b5263247b 100755
--- a/trunk/auto/options.sh
+++ b/trunk/auto/options.sh
@@ -140,6 +140,7 @@ Presets:
   --x86-x64                 [default] for x86/x64 cpu, common pc and servers.
   --pi                      for raspberry-pi(directly build), open features hls/ssl/static.
   --arm                     alias for --with-arm-ubuntu12
+  --mips                    alias for --with-mips-ubuntu12
   --dev                     for dev, open all features, no gperf/gprof/arm.
   --fast                    the most fast compile, nothing, only support vp6 RTMP.
   --pure-rtmp               only support RTMP with ssl.
@@ -147,13 +148,11 @@ Presets:
   --disable-all             disable all features, only support vp6 RTMP.
   
 Conflicts:
-  1. --dev/x86-x64 vs --static: 
-        the --static only for arm cpus.
-  2. --with-gmc vs --with-gmp: 
+  1. --with-gmc vs --with-gmp: 
         @see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html
-  3. --with-gperf/gmc/gmp vs --with-gprof:
+  2. --with-gperf/gmc/gmp vs --with-gprof:
         gperftools not compatible with gprof.
-  4. --arm vs --with-ffmpeg/bwtc/gperf/gmc/gmp/gprof:
+  3. --arm vs --with-ffmpeg/bwtc/gperf/gmc/gmp/gprof:
         the complex tools not available for arm.
 
 Experts:
diff --git a/trunk/configure b/trunk/configure
index 0660d7fab..7bdb36eae 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -64,12 +64,12 @@ if [ $SRS_MIPS_UBUNTU12 = YES ]; then
     __SrsArmRANDLIB="mipsel-openwrt-linux-ranlib";
 fi
 # the arm-ubuntu12 options for make for depends
-if [[ -z $SrsArmCC ]]; then SrsArmCC=__SrsArmCC; fi
-if [[ -z $SrsArmGCC ]]; then SrsArmGCC=__SrsArmGCC; fi
-if [[ -z $SrsArmCXX ]]; then SrsArmCXX=__SrsArmCXX; fi
-if [[ -z $SrsArmAR ]]; then SrsArmAR=__SrsArmAR; fi
-if [[ -z $SrsArmLD ]]; then SrsArmLD=__SrsArmLD; fi
-if [[ -z $SrsArmRANDLIB ]]; then SrsArmRANDLIB=__SrsArmRANDLIB; fi
+if [[ -z $SrsArmCC ]]; then SrsArmCC=$__SrsArmCC; fi
+if [[ -z $SrsArmGCC ]]; then SrsArmGCC=$__SrsArmGCC; fi
+if [[ -z $SrsArmCXX ]]; then SrsArmCXX=$__SrsArmCXX; fi
+if [[ -z $SrsArmAR ]]; then SrsArmAR=$__SrsArmAR; fi
+if [[ -z $SrsArmLD ]]; then SrsArmLD=$__SrsArmLD; fi
+if [[ -z $SrsArmRANDLIB ]]; then SrsArmRANDLIB=$__SrsArmRANDLIB; fi
 # write to source file
 if [ $SRS_EMBEDED_CPU = YES ]; then
     echo "cc=$SrsArmCC gcc=$SrsArmGCC g++=$SrsArmCXX ar=$SrsArmAR ld=$SrsArmLD randlib=$SrsArmRANDLIB"