Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist

1 files changed, 0 insertions, 84 deletions

diff --git a/cmake/macros/FindACE.cmake b/cmake/macros/FindACE.cmake
deleted file mode 100644
index bd534fb33db..00000000000
--- a/cmake/macros/FindACE.cmake
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Find the ACE client includes and library
-#
-
-# This module defines
-# ACE_INCLUDE_DIR, where to find ace.h
-# ACE_LIBRARIES, the libraries to link against
-# ACE_FOUND, if false, you cannot build anything that requires ACE
-
-# also defined, but not for general use are
-# ACE_LIBRARY, where to find the ACE library.
-
-set( ACE_FOUND 0 )
-
-if ( UNIX )
-  if (NOT ACE_INCLUDE_DIR)
-    FIND_PATH( ACE_INCLUDE_DIR
-      NAMES
-        ace/ACE.h
-      PATHS
-        /usr/include
-        /usr/include/ace
-        /usr/local/include
-        /usr/local/include/ace
-        $ENV{ACE_ROOT}
-        $ENV{ACE_ROOT}/ace
-        $ENV{ACE_ROOT}/include
-        ${CMAKE_SOURCE_DIR}/externals/ace
-    DOC
-      "Specify include-directories that might contain ace.h here."
-    )
-  endif()
-
-  if (NOT ACE_LIBRARY)
-    FIND_LIBRARY( ACE_LIBRARY
-      NAMES
-        ace ACE
-      PATHS
-        /usr/lib
-        /usr/lib/ace
-        /usr/local/lib
-        /usr/local/lib/ace
-        /usr/local/ace/lib
-        $ENV{ACE_ROOT}/lib
-        $ENV{ACE_ROOT}
-      DOC "Specify library-locations that might contain the ACE library here."
-    )
-
-  #  FIND_LIBRARY( ACE_EXTRA_LIBRARIES
-  #    NAMES
-  #      z zlib
-  #    PATHS
-  #      /usr/lib
-  #      /usr/local/lib
-  #    DOC
-  #      "if more libraries are necessary to link into ACE, specify them here."
-  #  )
-  endif()
-
-  if ( ACE_LIBRARY )
-    if ( ACE_INCLUDE_DIR )
-      if (_ACE_VERSION)
-        set(ACE_VERSION "${_ACE_VERSION}")
-      else (_ACE_VERSION)
-        file(STRINGS "${ACE_INCLUDE_DIR}/ace/Version.h" ACE_VERSION_STR REGEX "^#define ACE_VERSION \".*\"")
-        string(REGEX REPLACE "^.*ACE_VERSION \"([0-9].[0-9].[0-9a-z]).*$"
-           "\\1" ACE_VERSION "${ACE_VERSION_STR}")
-      endif (_ACE_VERSION)
-
-      include(EnsureVersion)
-      ENSURE_VERSION( "${ACE_EXPECTED_VERSION}" "${ACE_VERSION}" ACE_FOUND)
-      if (NOT ACE_FOUND)
-        message(FATAL_ERROR "TrinityCore needs ACE version ${ACE_EXPECTED_VERSION} but found version ${ACE_VERSION}")
-      endif()
-
-      message( STATUS "Found ACE library: ${ACE_LIBRARY}")
-      message( STATUS "Found ACE headers: ${ACE_INCLUDE_DIR}")
-    else ( ACE_INCLUDE_DIR )
-      message(FATAL_ERROR "Could not find ACE headers! Please install ACE libraries and headers")
-    endif ( ACE_INCLUDE_DIR )
-  endif ( ACE_LIBRARY )
-
-  mark_as_advanced( ACE_FOUND ACE_LIBRARY ACE_EXTRA_LIBRARIES ACE_INCLUDE_DIR )
-endif (UNIX)