From f59dae1d9c44303f9f5de14ab7c295e8a5338d39 Mon Sep 17 00:00:00 2001 From: cipherCOM Date: Mon, 20 Dec 2010 10:36:19 +0300 Subject: [PATCH] [10894] Fixed problems with new ACE lib on Darwin systems (based on cipherCOM's repo commit ce2638f) Signed-off-by: VladimirMangos --- dep/ACE_wrappers/configure.ac | 6 ++++-- src/shared/revision_nr.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dep/ACE_wrappers/configure.ac b/dep/ACE_wrappers/configure.ac index fa5b4a55d..e284ac49d 100644 --- a/dep/ACE_wrappers/configure.ac +++ b/dep/ACE_wrappers/configure.ac @@ -489,12 +489,14 @@ AC_CHECK_HEADER([dlfcn.h], case "$host_os" in darwin*) + dnl MaNGOS modification: fix MacOS build by use ACE_TEXT instead ACE_LIB_TEXT (make code similar used in config-macosx.h) AC_DEFINE([ACE_LD_SEARCH_PATH], - [ACE_LIB_TEXT ("DYLD_LIBRARY_PATH")], + [ACE_TEXT ("DYLD_LIBRARY_PATH")], [Define to environment variable used for DLL search path]) AC_DEFINE([ACE_DLL_SUFFIX], - [ACE_LIB_TEXT (".dylib")], + [ACE_TEXT (".dylib")], [Define to DLL file suffix]) + dnl MaNGOS modification end ;; esac ],[]) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index f058cc404..7c8c7c034 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10893" + #define REVISION_NR "10894" #endif // __REVISION_NR_H__