From fb5928f927f7a0bbb056d04df5dfaa2dc7275e88 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 23 Jan 2020 13:24:47 +0800
Subject: [PATCH] Fix build failed for SRT with modules.

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

diff --git a/trunk/auto/utest.sh b/trunk/auto/utest.sh
index d658bf7f4..ab96caea2 100755
--- a/trunk/auto/utest.sh
+++ b/trunk/auto/utest.sh
@@ -58,7 +58,7 @@ USER_DIR = .
 CPPFLAGS += -I\$(GTEST_DIR)/include
 
 # Flags passed to the C++ compiler.
-CXXFLAGS += -g -Wall -Wextra -O0 ${EXTRA_DEFINES}
+CXXFLAGS += ${CXXFLAGS} -Wextra ${EXTRA_DEFINES}
 
 # All tests produced by this Makefile.  Remember to add new tests you
 # created to the list.
diff --git a/trunk/configure b/trunk/configure
index 06fee5cf4..a639df52b 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -319,7 +319,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
     BUILD_KEY="srs" APP_MAIN="srs_main_server" APP_NAME="srs" . auto/apps.sh
     #
     # For modules, without the app module.
-    MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${SRT_OBJS[@]} ${PROTOCOL_OBJS[@]} ${SERVICE_OBJS[@]} ${MAIN_OBJS[@]}"
+    MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${PROTOCOL_OBJS[@]} ${SERVICE_OBJS[@]} ${MAIN_OBJS[@]}"
     #
     for SRS_MODULE in ${SRS_MODULES[*]}; do
         . $SRS_MODULE/config
@@ -342,7 +342,7 @@ if [ $SRS_UTEST = YES ]; then
     ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSTRoot} ${LibSSLRoot} ${LibSRTRoot})
     ModuleLibFiles=(${LibSTfile} ${LibSSLfile})
     MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "SERVICE" "APP" "SRT")
-    MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${PROTOCOL_OBJS[@]} ${SERVICE_OBJS[@]} ${APP_OBJS[@]}"
+    MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${PROTOCOL_OBJS[@]} ${SERVICE_OBJS[@]} ${APP_OBJS[@]} ${SRT_OBJS[@]}"
     LINK_OPTIONS="-lpthread ${SrsLinkOptions}" MODULE_DIR="src/utest" APP_NAME="srs_utest" . auto/utest.sh
 fi