From 4292aeabb93a32da46d5cd5d1d7994fae4783824 Mon Sep 17 00:00:00 2001
From: H0zen <H0zen@users.noreply.github.com>
Date: Mon, 7 Dec 2015 18:49:36 +0200
Subject: [PATCH] Corrections to the build system.

    - FreeBSD does not support ACE_Stack_Trace
    - Made internal ACE build symmetrical with its external counterpart
    - Removed a redundant compiler directive
---
 CMakeLists.txt                | 3 +++
 cmake/ImportACE.cmake         | 2 --
 src/shared/Utilities/Errors.h | 7 +------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 923f8d68..880d7d85 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,6 +105,9 @@ if(ACE_USE_EXTERNAL)
     endif()
 else()
     include(cmake/ImportACE.cmake)
+    if(NOT(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD"))
+        add_definitions(-DHAVE_ACE_STACK_TRACE_H)
+    endif()
 endif()
 
 if(POSTGRESQL)
diff --git a/cmake/ImportACE.cmake b/cmake/ImportACE.cmake
index 14ab4454..c7b4676b 100644
--- a/cmake/ImportACE.cmake
+++ b/cmake/ImportACE.cmake
@@ -37,8 +37,6 @@ link_directories(
   ${ACE_LIBRARIES_DIR}
 )
 
-set(HAVE_ACE_STACK_TRACE_H ON) # config.h.cmake
-
 #if(WIN32)
 #  foreach(DIR ${ACE_LIBRARIES_DIR})
 #    install(
diff --git a/src/shared/Utilities/Errors.h b/src/shared/Utilities/Errors.h
index ac6743e2..f226baa1 100644
--- a/src/shared/Utilities/Errors.h
+++ b/src/shared/Utilities/Errors.h
@@ -27,7 +27,6 @@
 
 #include "Common/Common.h"
 
-#define HAVE_ACE_STACK_TRACE_H 1
 
 #ifdef HAVE_ACE_STACK_TRACE_H
 #  include <ace/Stack_Trace.h>
@@ -71,10 +70,6 @@
     }
 #endif
 
-#ifdef MANGOS_DEBUG
-#  define MANGOS_ASSERT WPError
-#else
-#  define MANGOS_ASSERT WPError                             // Error even if in release mode.
-#endif
+#define MANGOS_ASSERT WPError                             // Error even if in release mode.
 
 #endif