diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh
index a345aaeb7..02e4e583b 100755
--- a/trunk/auto/options.sh
+++ b/trunk/auto/options.sh
@@ -217,7 +217,6 @@ if [ $SRS_ARM_UBUNTU12 = YES ]; then
     if [ $SRS_HTTP_CALLBACK = YES ]; then echo "http-callback for arm is not available, see: ./configure --help"; __check_ok=NO; fi
     if [ $SRS_BWTC = YES ]; then echo "bwtc for arm is not available, see: ./configure --help"; __check_ok=NO; fi
     if [ $SRS_RESEARCH = YES ]; then echo "research for arm is not available, see: ./configure --help"; __check_ok=NO; fi
-    if [ $SRS_UTEST = YES ]; then echo "utest for arm is not available, see: ./configure --help"; __check_ok=NO; fi
     if [ $SRS_GPERF = YES ]; then echo "gperf for arm is not available, see: ./configure --help"; __check_ok=NO; fi
     if [ $SRS_GPERF_MC = YES ]; then echo "gmc for arm is not available, see: ./configure --help"; __check_ok=NO; fi
     if [ $SRS_GPERF_MP = YES ]; then echo "gmp for arm is not available, see: ./configure --help"; __check_ok=NO; fi
diff --git a/trunk/auto/utest.sh b/trunk/auto/utest.sh
old mode 100644
new mode 100755
index efe693edd..45b4a15bc
--- a/trunk/auto/utest.sh
+++ b/trunk/auto/utest.sh
@@ -6,6 +6,7 @@
 #
 #     $APP_NAME the app name to output. ie. srs_utest
 #     $MODULE_DIR the src dir of utest code. ie. src/utest
+#     $LINK_OPTIONS the link options for utest. ie. -lpthread -ldl
 
 FILE=${SRS_OBJS}/utest/${SRS_MAKEFILE}
 # create dir for Makefile
@@ -169,7 +170,7 @@ echo "" >> ${FILE}; echo "" >> ${FILE}
 echo "# generate the utest binary" >> ${FILE}
 cat << END >> ${FILE}
 ${SRS_TRUNK_PREFIX}/${SRS_OBJS}/${APP_NAME} : \$(SRS_UTEST_DEPS) ${MODULE_OBJS} gtest_main.a
-	\$(CXX) -o \$@ \$(CPPFLAGS) \$(CXXFLAGS) \$^ \$(DEPS_LIBRARIES_FILES) -lpthread -ldl
+	\$(CXX) -o \$@ \$(CPPFLAGS) \$(CXXFLAGS) \$^ \$(DEPS_LIBRARIES_FILES) ${LINK_OPTIONS}
 END
 
 #####################################################################################
diff --git a/trunk/configure b/trunk/configure
index 8602252ea..e59bb939d 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -30,6 +30,10 @@ if [[ -f Makefile ]]; then
 fi
 
 # write user options to headers
+echo "#ifndef SRS_AUTO_HEADER_HPP" >> $SRS_AUTO_HEADERS_H
+echo "#define SRS_AUTO_HEADER_HPP" >> $SRS_AUTO_HEADERS_H
+echo "" >> $SRS_AUTO_HEADERS_H
+
 echo "#define SRS_BUILD_TS \"`date +%s`\"" >> $SRS_AUTO_HEADERS_H
 echo "#define SRS_BUILD_DATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $SRS_AUTO_HEADERS_H
 echo "#define SRS_UNAME \"`uname -a`\"" >> $SRS_AUTO_HEADERS_H
@@ -52,6 +56,10 @@ SrsArmRANDLIB="arm-linux-gnueabi-ranlib"
 # apply user options.
 . auto/depends.sh
 
+# auto header EOF.
+echo "#endif" >> $SRS_AUTO_HEADERS_H
+echo "" >> $SRS_AUTO_HEADERS_H
+
 #####################################################################################
 # generate Makefile.
 #####################################################################################
@@ -398,7 +406,7 @@ ModuleLibIncs=(${SRS_OBJS} ${LibSTRoot})
 ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile})
 MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP")
 MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]}"
-MODULE_DIR="src/utest" APP_NAME="srs_utest" . auto/utest.sh
+LINK_OPTIONS="-lpthread ${SrsLinkOptions}" MODULE_DIR="src/utest" APP_NAME="srs_utest" . auto/utest.sh
 
 echo 'configure ok! '