*Merge

--HG--
branch : trunk

CMakeLists.txt

@@ -122,7 +122,9 @@ if(ACE_FOUND)
 message(STATUS "Found ACE library: ${ACE_LIBRARY}")
 message(STATUS "Include dir is: ${ACE_INCLUDE_DIR}")
 else(ACE_FOUND)
-message(SEND_ERROR "** ACE library not found! Trinity Core will not build!")
+message(SEND_ERROR "** ACE library not found! Trinity Core cannot be compiled!")
+message(SEND_ERROR "** Please build ACE from http://www.cs.wustl.edu/~schmidt/ACE.html")
+message(SEND_ERROR "** your distro may provide a binary for ACE e.g. for ubuntu try apt-get install libace-dev")
 return()
 #SET(BUILD_ACE 1)
 #SET(ACE_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/dep/ACE_wrappers ${CMAKE_BINARY_DIR}/dep/ACE_wrappers")
@@ -154,6 +156,12 @@ ${CMAKE_CURRENT_SOURCE_DIR}/..
 ${ACE_INCLUDE_DIR}
 )
 
+if(PREFIX)
+message("* Running ldconfig")
+file(WRITE /etc/ld.so.conf.d/trinitycore.conf "${CMAKE_INSTALL_PREFIX}/lib")
+execute_process(COMMAND ldconfig)
+endif(PREFIX)
+
 add_subdirectory(dep)
 add_subdirectory(doc)
 add_subdirectory(src)

src/bindings/interface/CMakeLists.txt

@@ -11,7 +11,7 @@ SET(trinityinterface_LIB_SRCS
    Scripts/sc_defines.h
 )
 
-add_library(trinityinterface STATIC ${trinityinterface_LIB_SRCS})
+add_library(trinityinterface SHARED ${trinityinterface_LIB_SRCS})
 
 target_link_libraries(trinityinterface)
 

src/bindings/scripts/CMakeLists.txt

@@ -380,7 +380,7 @@ SET(trinityscript_LIB_SRCS
    system.cpp
 )
 
-add_library(trinityscript STATIC ${trinityscript_LIB_SRCS})
+add_library(trinityscript SHARED ${trinityscript_LIB_SRCS})
 
 target_link_libraries(trinityscript)
 

src/trinitycore/trinitycore.conf.dist

@@ -653,6 +653,11 @@ Server.LoginInfo = 0
 #        Default: 0 (Not allowed)
 #                 1 (Allowed)
 #
+#    AllowTwoSide.Trade
+#        Allow or not trading with other team in party.
+#        Default: 0 (Not allowed)
+#                 1 (Allowed)
+#
 #    TalentsInspecting
 #        Allow other players see character talents in inspect dialog (Characters in Gamemaster mode can
 #        inspect talents always)