From 43c4277b042fafca6b04503ce10b52c6cc2952ed Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@teaspeak.de>
Date: Fri, 24 Jan 2020 21:05:10 +0100
Subject: [PATCH] Improved webclient handling

---
 CMakeLists.txt        | 29 ++++++++---------------------
 server/CMakeLists.txt | 13 +++++++++++++
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9597354..1aca011 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,14 @@ set(TEASPEAK_SERVER ON)
 #set(MEMORY_DEBUG_FLAGS " -fsanitize=leak -fsanitize=address -fstack-protector-all ")
 #set(MEMORY_DEBUG_FLAGS "-fsanitize=address")
 
+if (NOT BUILD_OS_ARCH)
+    set(BUILD_OS_ARCH $ENV{build_os_arch})
+endif ()
+
+if (NOT BUILD_OS_ARCH)
+    set(BUILD_OS_ARCH $ENV{build_os_arch})
+endif ()
+
 set(LIBRARY_PATH "${CMAKE_SOURCE_DIR}/../libraries/")
 if (BUILD_INCLUDE_FILE)
     include(${BUILD_INCLUDE_FILE})
@@ -37,14 +45,6 @@ function(resolve_library VARIABLE FALLBACK PATHS)
     endif()
 endfunction()
 
-if (NOT BUILD_OS_ARCH)
-    set(BUILD_OS_ARCH $ENV{BUILD_OS_ARCH})
-endif ()
-
-if (NOT BUILD_OS_ARCH)
-    set(BUILD_OS_ARCH $ENV{build_os_arch})
-endif ()
-
 find_package(TomMath REQUIRED)
 find_package(TomCrypt REQUIRED)
 find_package(Breakpad REQUIRED)
@@ -78,19 +78,6 @@ include_directories(${DataPipes_INCLUDE_DIR})
 include_directories(${LIBEVENT_INCLUDE_DIRS})
 include_directories(${StringVariable_INCLUDE_DIR})
 
-resolve_library(LIBRARY_PATH_NICE               OFF "${LIBRARY_PATH}/libnice/linux_${BUILD_OS_ARCH}/lib/libnice.a")
-message("Found libnice at ${LIBRARY_PATH_NICE}")
-
-if (EXISTS "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/i386-linux-gnu/")
-    set(GLIBC_LIB_DIR "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/i386-linux-gnu/")
-elseif(EXISTS "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/x86_64-linux-gnu/")
-    set(GLIBC_LIB_DIR "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/x86_64-linux-gnu/")
-else()
-    message(FATAL_ERROR "Failed to find glibc")
-endif ()
-message("Found GLIBC lib dir at ${GLIBC_LIB_DIR}")
-set(LIBRARY_PATH_GLIBC "${GLIBC_LIB_DIR}/libgio-2.0.a;${GLIBC_LIB_DIR}/libgmodule-2.0.a;${GLIBC_LIB_DIR}/libgobject-2.0.a;${GLIBC_LIB_DIR}/libglib-2.0.a;${GLIBC_LIB_DIR}/libffi.a;resolv")
-
 add_definitions(-DINET -DINET6)
 add_subdirectory(shared/)
 add_subdirectory(server/)
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 2619315..f9236ef 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -280,6 +280,19 @@ target_link_libraries(TeaSpeakServer
         )
 
 if (COMPILE_WEB_CLIENT)
+    resolve_library(LIBRARY_PATH_NICE OFF "${LIBRARY_PATH}/libnice/linux_${BUILD_OS_ARCH}/lib/libnice.a")
+    message("Found libnice at ${LIBRARY_PATH_NICE}")
+
+    if (EXISTS "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/i386-linux-gnu/")
+        set(GLIBC_LIB_DIR "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/i386-linux-gnu/")
+    elseif(EXISTS "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/x86_64-linux-gnu/")
+        set(GLIBC_LIB_DIR "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/x86_64-linux-gnu/")
+    else()
+        message(FATAL_ERROR "Failed to find glibc")
+    endif ()
+    message("Found GLIBC lib dir at ${GLIBC_LIB_DIR}")
+    set(LIBRARY_PATH_GLIBC "${GLIBC_LIB_DIR}/libgio-2.0.a;${GLIBC_LIB_DIR}/libgmodule-2.0.a;${GLIBC_LIB_DIR}/libgobject-2.0.a;${GLIBC_LIB_DIR}/libglib-2.0.a;${GLIBC_LIB_DIR}/libffi.a;resolv")
+
     find_package(UsrSCTP REQUIRED)
     target_link_libraries(TeaSpeakServer
             ${LIBRARY_PATH_NICE}