diff --git a/trunk/auto/utest.sh b/trunk/auto/utest.sh
index f29d698ba..970d93844 100755
--- a/trunk/auto/utest.sh
+++ b/trunk/auto/utest.sh
@@ -118,7 +118,11 @@ done
 #
 # depends library header files
 for item in ${ModuleLibIncs[*]}; do
-    echo -n "-I${SRS_TRUNK_PREFIX}/${item} " >> ${FILE}
+    if [[ "${item:0:1}" == "/" ]]; then
+        echo -n "-I${item} " >> ${FILE}
+    else
+        echo -n "-I${SRS_TRUNK_PREFIX}/${item} " >> ${FILE}
+    fi
 done
 echo "" >> ${FILE}; echo "" >> ${FILE}
 
@@ -164,10 +168,10 @@ echo "" >> ${FILE}
 echo "# link all depends libraries" >> ${FILE}
 echo -n "DEPS_LIBRARIES_FILES = " >> ${FILE}
 for item in ${ModuleLibFiles[*]}; do
-    if [[ -f ${item} ]]; then
-        echo -n "${SRS_TRUNK_PREFIX}/${item} " >> ${FILE}
-    else
+    if [[ "${item:0:1}" == "/" ]]; then
         echo -n "${item} " >> ${FILE}
+    else
+        echo -n "${SRS_TRUNK_PREFIX}/${item} " >> ${FILE}
     fi
 done
 echo "" >> ${FILE}; echo "" >> ${FILE}
diff --git a/trunk/configure b/trunk/configure
index 6d6ca4a11..b77baca7b 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -395,6 +395,9 @@ fi
 if [[ $SRS_FFMPEG_FIT == YES ]]; then
     ModuleLibFiles+=("${LibFfmpegFile[*]}")
 fi
+if [[ $SRS_GB28181 == YES ]]; then
+    ModuleLibFiles+=("${LibIconvfile[*]}")
+fi
 #
 for SRS_MODULE in ${SRS_MODULES[*]}; do
     . auto/reset_module.sh && . $SRS_MODULE/config
@@ -433,6 +436,9 @@ if [ $SRS_UTEST = YES ]; then
     if [[ $SRS_SRT == YES ]]; then
         ModuleLibFiles+=("${LibSRTfile[*]}")
     fi
+    if [[ $SRS_GB28181 == YES ]]; then
+        ModuleLibFiles+=("${LibIconvfile[*]}")
+    fi
     MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP")
     if [[ $SRS_SRT == YES ]]; then
         MODULE_DEPENDS+=("SRT")
diff --git a/trunk/src/main/srs_main_ingest_hls.cpp b/trunk/src/main/srs_main_ingest_hls.cpp
index cbc69119b..6eda7b2bd 100644
--- a/trunk/src/main/srs_main_ingest_hls.cpp
+++ b/trunk/src/main/srs_main_ingest_hls.cpp
@@ -58,6 +58,9 @@ ISrsContext* _srs_context = new SrsThreadContext();
 // @global config object for app module.
 SrsConfig* _srs_config = new SrsConfig();
 
+// @global Other variables.
+bool _srs_in_docker = false;
+
 /**
  * main entrance.
  */
diff --git a/trunk/src/main/srs_main_mp4_parser.cpp b/trunk/src/main/srs_main_mp4_parser.cpp
index d9ecc36e5..a7aec32d4 100644
--- a/trunk/src/main/srs_main_mp4_parser.cpp
+++ b/trunk/src/main/srs_main_mp4_parser.cpp
@@ -44,6 +44,9 @@ ISrsContext* _srs_context = new SrsThreadContext();
 // @global config object for app module.
 SrsConfig* _srs_config = new SrsConfig();
 
+// @global Other variables.
+bool _srs_in_docker = false;
+
 srs_error_t parse(std::string mp4_file, bool verbose)
 {
     srs_error_t err = srs_success;