From 00a8eef580a0931a46eeb7690918ef8e39cdcfe3 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 25 Apr 2021 12:07:00 +0800
Subject: [PATCH] Fix utest fail

---
 trunk/auto/utest.sh | 12 ++++++++----
 trunk/configure     |  6 ++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

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")