josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[svn] * Fixed compile from r78

Browse Source 
* Fixed: not apply healling bonus to spell 40972 heal amount. - Source Mangos
* Item 30627 hidden cooldown - Source Mangos
* Fixed Trinityrealm autopatching system - Source Arrai
* Add support for autoconf 2.6.2 and newer - Source Derex
Some decent sized changes, please test before deploying - KP

--HG--
branch : trunk
This commit is contained in:
KingPin
2008-10-19 21:08:34 -05:00
parent 0cb3a79518
commit fcde03a036
20 changed files with 374 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dep/ACE_wrappers/m4/ace_defines.m4
+4 -4
View File
@@ -20,12 +20,12 @@ AS_VAR_POPDEF([ac_var])dnl
#-----------------------------------------------------------------------------
AC_DEFUN([ACE_CHECK_HAS_DEFINES],
[AC_FOREACH([ACE_Def], [$1],
[AH_TEMPLATE(AS_TR_CPP(ACE_HAS_[]ACE_Def),
[AH_TEMPLATE(AS_TR_CPP([ACE_HAS_]ACE_Def),
[Define to 1 if platform has ]ACE_Def[().])])dnl
for ace_def in $1
do
ACE_CHECK_DEFINE($ace_def,
[AC_DEFINE_UNQUOTED([AS_TR_CPP([ACE_HAS_$ace_def])]) $2],
[AC_DEFINE_UNQUOTED(AS_TR_CPP([ACE_HAS_$ace_def])) $2],
[$3],
[$4])dnl
done
@@ -36,13 +36,13 @@ done
#-----------------------------------------------------------------------------
AC_DEFUN([ACE_CHECK_LACKS_DEFINES],
[AC_FOREACH([ACE_Def], [$1],
[AH_TEMPLATE(AS_TR_CPP(ACE_LACKS_[]ACE_Def),
[AH_TEMPLATE(AS_TR_CPP([ACE_LACKS_]ACE_Def),
[Define to 1 if platform lacks ]ACE_Def[().])])dnl
for ace_def in $1
do
ACE_CHECK_DEFINE($ace_def,
[$2],
[AC_DEFINE_UNQUOTED([AS_TR_CPP([ACE_LACKS_$ace_def])]) $3],
[AC_DEFINE_UNQUOTED(AS_TR_CPP([ACE_LACKS_$ace_def])) $3],
[$4])dnl
done
])
dep/ACE_wrappers/m4/ace_func.m4
+34
View File
@@ -146,3 +146,37 @@ if test "$ac_cv_func_wcsdup" = no; then
fi
fi
])
# ACE_CHECK_SYSINFO
#
# SVR4 and Linux have completely independent implementations of the
# sysinfo() system / library call.
#
# The SVR4 signature is:
# #include <sys/systeminfo.h>
# long sysinfo (int command, char *buf, long count)
#
# While the Linux signature is:
# #include <sys/sysinfo.h>
# int sysinfo (struct sysinfo* info);
#
# SVR4 (or at least Solaris) also has a sys/sysinfo.h header, so that
# cannot be used to distinguish between the two varients. As far as I
# know, Linux does not have a sys/systeminfo.h header, so that can.
#
# ACE uses the ACE_HAS_SYSV_SYSINFO feature test macro for the first
# and ACE_HAS_LINUX_SYSINFO for the second.
#
AC_DEFUN([ACE_CHECK_FUNC_SYSINFO],[
ACE_CHECK_HAS_HEADERS(sys/sysinfo.h sys/systeminfo.h)
AC_CHECK_FUNC(sysinfo)
if test "$ac_cv_func_sysinfo" = yes; then
if test "$ac_cv_header_sys_systeminfo_h" = yes; then
AC_DEFINE([ACE_HAS_SYSV_SYSINFO], 1,
[Define to 1 if system has SysV version of sysinfo().])
elif test "$ac_cv_header_sys_sysinfo_h" = yes; then
AC_DEFINE([ACE_HAS_LINUX_SYSINFO], 1,
[Define to 1 if system has Linux version of sysinfo().])
fi
fi
])
dep/ACE_wrappers/m4/ace_functions.m4
+4 -4
View File
@@ -2,12 +2,12 @@
#---------------------------------------------------------------------------
AC_DEFUN([ACE_CHECK_HAS_FUNCS],
[AC_FOREACH([ACE_Func], [$1],
[AH_TEMPLATE(AS_TR_CPP(ACE_HAS_[]ACE_Func),
[AH_TEMPLATE(AS_TR_CPP([ACE_HAS_]ACE_Func),
[Define to 1 if platform has ]ACE_Func[().])])dnl
for ace_func in $1
do
AC_CHECK_FUNC($ace_func,
[AC_DEFINE_UNQUOTED([AS_TR_CPP([ACE_HAS_$ace_func])]) $2],
[AC_DEFINE_UNQUOTED(AS_TR_CPP([ACE_HAS_$ace_func])) $2],
[$3])dnl
done
])
@@ -16,12 +16,12 @@ done
#-----------------------------------------------------------------------------
AC_DEFUN([ACE_CHECK_LACKS_FUNCS],
[AC_FOREACH([ACE_Func], [$1],
[AH_TEMPLATE(AS_TR_CPP(ACE_LACKS_[]ACE_Func),
[AH_TEMPLATE(AS_TR_CPP([ACE_LACKS_]ACE_Func),
[Define to 1 if platform lacks ]ACE_Func[().])])dnl
for ace_func in $1
do
AC_CHECK_FUNC($ace_func,
[$2],
[AC_DEFINE_UNQUOTED([AS_TR_CPP([ACE_LACKS_$ace_func])]) $3])dnl
[AC_DEFINE_UNQUOTED(AS_TR_CPP([ACE_LACKS_$ace_func])) $3])dnl
done
])
dep/ACE_wrappers/m4/ace_headers.m4
+4 -4
View File
@@ -5,12 +5,12 @@
#-----------------------------------------------------------------------------
AC_DEFUN([ACE_CHECK_HAS_HEADERS],
[AC_FOREACH([ACE_Header], [$1],
[AH_TEMPLATE(AS_TR_CPP(ACE_HAS_[]ACE_Header),
[AH_TEMPLATE(AS_TR_CPP([ACE_HAS_]ACE_Header),
[Define to 1 if platform has the <]ACE_Header[> header file.])])dnl
for ace_header in $1
do
AC_CHECK_HEADER($ace_header,
[AC_DEFINE_UNQUOTED([AS_TR_CPP([ACE_HAS_$ace_header])]) $2],
[AC_DEFINE_UNQUOTED(AS_TR_CPP([ACE_HAS_$ace_header])) $2],
[$3],
[$4])dnl
done
@@ -23,13 +23,13 @@ done
#-----------------------------------------------------------------------------
AC_DEFUN([ACE_CHECK_LACKS_HEADERS],
[AC_FOREACH([ACE_Header], [$1],
[AH_TEMPLATE(AS_TR_CPP(ACE_LACKS_[]ACE_Header),
[AH_TEMPLATE(AS_TR_CPP([ACE_LACKS_]ACE_Header),
[Define to 1 if platform lacks the <]ACE_Header[> header file.])])dnl
for ace_header in $1
do
AC_CHECK_HEADER($ace_header,
[$2],
[AC_DEFINE_UNQUOTED([AS_TR_CPP([ACE_LACKS_$ace_header])]) $3],
[AC_DEFINE_UNQUOTED(AS_TR_CPP([ACE_LACKS_$ace_header])) $3],
[$4])dnl
done
])
dep/ACE_wrappers/m4/acinclude.m4
+18 -95
View File
@@ -1,5 +1,5 @@
dnl -------------------------------------------------------------------------
dnl $Id: acinclude.m4 80826 2008-03-04 14:51:23Z wotte $
dnl $Id: acinclude.m4 82832 2008-09-25 17:38:39Z jtc $
dnl
dnl ACE M4 include file which contains general M4 macros
dnl to be used by the ACE configure script.
@@ -201,101 +201,8 @@ dnl checks for header files
dnl checks for typedefs
dnl Check for specific typedef in given header file
dnl Usage: ACE_CHECK_TYPE(TYPEDEF, INCLUDE,
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl This macro can only check for one typedef in one header file at a time!!
AC_DEFUN([ACE_CHECK_TYPE],
[
dnl AC_REQUIRE([AC_PROG_CXX])
dnl AC_REQUIRE([AC_PROG_CXXCPP])
dnl AC_LANG([C++])
dnl AC_REQUIRE([AC_LANG])
ACE_CACHE_CHECK([for $1 in $2], [ace_cv_type_$1],
[
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <$2>
]], [[
$1 ace_$1;
]])],[
ace_cv_type_$1=yes
],[
ace_cv_type_$1=no
])
],[$3],[$4])
])
dnl checks for structures
dnl Check for specific struct in given header file
dnl Usage: ACE_CHECK_STRUCT(STRUCTURE, INCLUDE,
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl This macro can only check for one struct in one header file at a time!!
AC_DEFUN([ACE_CHECK_STRUCT],
[
dnl AC_REQUIRE([AC_PROG_CXX])
dnl AC_REQUIRE([AC_PROG_CXXCPP])
dnl AC_LANG([C++])
dnl AC_REQUIRE([AC_LANG])
dnl Do the transliteration at runtime so arg 1 can be a shell variable.
dnl ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
ACE_CACHE_CHECK([for struct $1 in $2], [ace_cv_struct_$1],
[
ACE_TRY_COMPILE_STRUCT([$1], [$2],
[
ace_cv_struct_$1=yes
],
[
ace_cv_struct_$1=no
])
], $3, $4)
])
dnl Check for specific struct in given header file by compiling a test
dnl program. This macro is used by ACE_CHECK_STRUCT.
dnl Usage: ACE_TRY_COMPILE_STRUCT(STRUCTURE, INCLUDE,
dnl [ACTION-IF-SUCCESSFUL[, ACTION-IF-NOT-SUCCESSFUL]])
dnl This macro can only check for one struct in one header file at a time!!
AC_DEFUN([ACE_TRY_COMPILE_STRUCT],
[
dnl AC_REQUIRE([AC_PROG_CXX])
dnl AC_REQUIRE([AC_PROG_CXXCPP])
dnl AC_LANG([C++])
dnl AC_REQUIRE([AC_LANG])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <$2>
]], [[
struct $1 ace_$1;
]])],[
$3
],[
dnl Some compilers don't like the "struct" but we need the struct for
dnl some platforms to resolve ambiguities between functions and
dnl structures with with the same name. So, we try the same test but
dnl without "struct" if the above test with "struct" fails. If both
dnl tests fail, then we can be reasonably sure that we don't have the
dnl structure we are testing for.
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[[
#include <$2>
]],
[[
$1 ace_$1;
]])],
[
$3
],
[
$4
])
])
])
dnl checks for variables
dnl checks for compiler characteristics
@@ -492,6 +399,22 @@ dnl Check for 64 bit llseek() or lseek64()
dnl Usage: ACE_CHECK_LSEEK64
AC_DEFUN([ACE_CHECK_LSEEK64],
[
AH_TEMPLATE([ACE_HAS_LSEEK64],
[Platform supports lseek64(). This should not be defined if
ACE_HAS_LLSEEK is defined.])
AH_TEMPLATE([ACE_LACKS_LSEEK64_PROTOTYPE],
[Platform/compiler lacks the lseek64() prototype. This should not
be defined if ACE_LACKS_LLSEEK_PROTOTYPE is defined.])
AH_TEMPLATE([ACE_HAS_LLSEEK],
[Platform supports llseek(). This should not be defined if
ACE_HAS_LSEEK64 is defined.])
AH_TEMPLATE([ACE_LACKS_LLSEEK_PROTOTYPE],
[Platform/compiler lacks the llseek() prototype. This should not
be defined if ACE_LACKS_LSEEK64_PROTOTYPE is defined.])
AC_CHECK_FUNC([lseek64],
[
AC_DEFINE([ACE_HAS_LSEEK64])
@@ -599,4 +522,4 @@ dnl mismatched parentheses.
dnl checks for structures
dnl checks for system services
dnl checks for system services
dep/ACE_wrappers/m4/config_h.m4
+9 -69
View File
@@ -1,5 +1,5 @@
dnl -------------------------------------------------------------------------
dnl $Id: config_h.m4 82277 2008-07-09 17:45:59Z jtc $
dnl $Id: config_h.m4 82833 2008-09-25 18:28:53Z jtc $
dnl
dnl config_h.m4
dnl
@@ -7,6 +7,13 @@ dnl ACE M4 include file which contains preprocessor constants
dnl and other items to be place in the generated ace/config.h
dnl header.
dnl
dnl Please try to avoid adding new autoheader templates to this
dnl file, as they get included in both ACE and TAO config.h.in
dnl files, even though the cooresponding feature tests are only
dnl included in the ACE configure script. Put the autoheader
dnl template in a AC_DEFUN used for the feature test, or use the
dnl AC_DEFINE macro's third argument.
dnl
dnl -------------------------------------------------------------------------
dnl Copyright (C) 2002, 2003 Ossama Othman
@@ -335,17 +342,6 @@ AH_TEMPLATE([ACE_HAS_GPERF],
AH_TEMPLATE([ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT],
[Optimize ACE_Handle_Set::count_bits for select() operations (common case)])
AH_TEMPLATE([ACE_HAS_LSEEK64],
[Platform supports lseek64(). This should not be defined if
ACE_HAS_LLSEEK is defined.])
AH_TEMPLATE([ACE_HAS_LLSEEK],
[Platform supports llseek(). This should not be defined if
ACE_HAS_LSEEK64 is defined.])
AH_TEMPLATE([ACE_HAS_HI_RES_TIMER],
[Compiler/platform supports SunOS high resolution timers])
AH_TEMPLATE([ACE_HAS_INLINED_OSCALLS],[
Inline all the static class OS methods to remove call overhead
Note: This gets defined by OS.h if __ACE_INLINE__ is defined])
@@ -473,8 +469,6 @@ AH_TEMPLATE([ACE_HAS_PROC_FS],
[Platform supports the /proc file system and defines tid_t
in <sys/procfs.h>])
AH_TEMPLATE([ACE_HAS_PRUSAGE_T],[Platform supports the prusage_t struct])
AH_TEMPLATE([ACE_HAS_PTHREADS_UNIX98_EXT],
[Platform has the UNIX98 extensions to Pthreads (rwlocks)])
@@ -568,8 +562,6 @@ AH_TEMPLATE([ACE_HAS_THR_YIELD],[Platform has thr_yield()])
AH_TEMPLATE([ACE_HAS_STANDARD_CPP_LIBRARY],
[Platform/compiler supports Standard C++ Library])
AH_TEMPLATE([ACE_HAS_STRBUF_T],[Compiler/platform supports struct strbuf])
AH_TEMPLATE([ACE_HAS_STREAMS],[Platform supports STREAMS])
AH_TEMPLATE([ACE_HAS_STREAM_PIPES],[Platform supports STREAM pipes])
@@ -598,9 +590,6 @@ AH_TEMPLATE([ACE_HAS_SVR4_SIGNAL_T],
AH_TEMPLATE([ACE_HAS_SVR4_TLI],
[Compiler/platform supports SVR4 TLI (in particular, T_GETNAME stuff).])
AH_TEMPLATE([ACE_HAS_SYSINFO],
[Platform supports system configuration information.])
AH_TEMPLATE([ACE_HAS_SYSV_IPC],
[Platform supports System V IPC (most versions of UNIX, but not Win32)])
@@ -717,10 +706,6 @@ AH_TEMPLATE([ACE_LACKS_COND_TIMEDWAIT_RESET],
[pthread_cond_timedwait does *not* reset the time argument when
the lock is acquired.])
AH_TEMPLATE([ACE_LACKS_CONDATTR_PSHARED],
[Platform has no implementation of pthread_condattr_setpshared(), even
though it supports pthreads!])
AH_TEMPLATE([ACE_LACKS_CONST_STRBUF_PTR],
[Platform uses struct strbuf * rather than const struct strbuf *
(e.g., HP/UX 10.x)])
@@ -732,8 +717,6 @@ AH_TEMPLATE([ACE_LACKS_EXEC],
[Platform lacks the exec() family of system calls (e.g., Win32,
VxWorks, Chorus)])
AH_TEMPLATE([ACE_LACKS_FILELOCKS],[Platform lacks file locking mechanism])
AH_TEMPLATE([ACE_LACKS_GETSERVBYNAME],
[Platforms lacks getservbyname() (e.g., VxWorks and Chorus).])
@@ -758,9 +741,6 @@ AH_TEMPLATE([ACE_LACKS_MODE_MASKS],
AH_TEMPLATE([ACE_LACKS_MSG_ACCRIGHTS],
[Platform defines ACE_HAS_MSG, but lacks msg_accrights{len}.])
AH_TEMPLATE([ACE_LACKS_MUTEXATTR_PSHARED],
[Platform lacks pthread_mutexattr_setpshared().])
AH_TEMPLATE([ACE_LACKS_NULL_PTHREAD_STATUS],
[OS requires non-null status pointer for pthread_join ()])
@@ -770,19 +750,10 @@ AH_TEMPLATE([ACE_HAS_MUTEX_TIMEOUTS],
AH_TEMPLATE([ACE_LACKS_NAMED_POSIX_SEM],
[Platform lacks named POSIX semaphores (e.g., Chorus)])
AH_TEMPLATE([ACE_LACKS_STRPTIME],
[Platform lacks native strptime() implementation.])
AH_TEMPLATE([ACE_LACKS_RLIMIT],
[Platform/compiler lacks {get,set}rlimit() function (e.g., VxWorks,
Chorus, and SCO UNIX)])
AH_TEMPLATE([ACE_LACKS_RWLOCKATTR_PSHARED],
[Platform lacks pthread_rwlockattr_setpshared().])
AH_TEMPLATE([ACE_LACKS_PLACEMENT_OPERATOR_NEW],
[Compiler doesn't support placement operator new(size_t, void *).])
AH_TEMPLATE([ACE_LACKS_PLACEMENT_OPERATOR_DELETE],
[Compiler doesn't support placement operator delete(void *, void *).])
@@ -797,39 +768,21 @@ AH_TEMPLATE([ACE_LACKS_PWD_FUNCTIONS],
AH_TEMPLATE([ACE_LACKS_PWD_REENTRANT_FUNCTIONS],
[Platform lacks getpwnam_r() methods (e.g., SGI 6.2).])
AH_TEMPLATE([ACE_LACKS_RWLOCK_T],[Platform lacks readers/writer locks.])
AH_TEMPLATE([ACE_LACKS_SEMBUF_T],
[Platform lacks struct sembuf (e.g., Win32 and VxWorks)])
AH_TEMPLATE([ACE_LACKS_SETDETACH],
[Platform lacks pthread_attr_setdetachstate() (e.g., HP/UX 10.x)])
AH_TEMPLATE([ACE_LACKS_SETSCHED],
[Platform lacks pthread_attr_setsched() (e.g. MVS)])
AH_TEMPLATE([ACE_LACKS_SIGACTION],
[Platform lacks struct sigaction (e.g., Win32 and Chorus)])
AH_TEMPLATE([ACE_LACKS_SIGNED_CHAR],
[Platform lacks "signed char" type (broken!)])
AH_TEMPLATE([ACE_LACKS_SIGSET],
[Platform lacks signal sets (e.g., Chorus and Win32)])
AH_TEMPLATE([ACE_LACKS_STRUCT_DIR],
[Platform lacks dirent structure.])
AH_TEMPLATE([ACE_LACKS_SYS_MSG_H],
[Platform lacks sys/msg.h (e.g., Chorus and VxWorks)])
AH_TEMPLATE([ACE_LACKS_SYSV_MSQ_PROTOS],
[Platform lacks SYSV message queue prototypes])
AH_TEMPLATE([ACE_LACKS_SI_ADDR],
[Platform lacks the si_addr field of siginfo_t (e.g., VxWorks and
HP/UX 10.x)])
AH_TEMPLATE([ACE_LACKS_SYSV_SHMEM],
[Platform lacks System V shared memory (e.g., Win32 and VxWorks)])
@@ -839,8 +792,6 @@ AH_TEMPLATE([ACE_LACKS_SOCKET_BUFSIZ],
AH_TEMPLATE([ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES],
[Compiler doesn't support static data member templates])
AH_TEMPLATE([ACE_LACKS_STRRECVFD],[Platform doesn't define struct strrecvfd.])
AH_TEMPLATE([ACE_LACKS_T_ERRNO],[Header files lack t_errno for TLI])
AH_TEMPLATE([ACE_LACKS_TCP_NODELAY],[OS does not support TCP_NODELAY])
@@ -854,14 +805,6 @@ AH_TEMPLATE([ACE_LACKS_TIMESPEC_T],
AH_TEMPLATE([ACE_LACKS_STRTOK_R_PROTOTYPE],
[Platform/compiler lacks the strtok_r() prototype])
AH_TEMPLATE([ACE_LACKS_LSEEK64_PROTOTYPE],
[Platform/compiler lacks the lseek64() prototype. This should not
be defined if ACE_LACKS_LLSEEK_PROTOTYPE is defined.])
AH_TEMPLATE([ACE_LACKS_LLSEEK_PROTOTYPE],
[Platform/compiler lacks the llseek() prototype. This should not
be defined if ACE_LACKS_LSEEK64_PROTOTYPE is defined.])
AH_TEMPLATE([ACE_LACKS_PREAD_PROTOTYPE],
[Platform/compiler lacks the pread() and pwrite() prototypes])
@@ -881,9 +824,6 @@ AH_TEMPLATE([ACE_LACKS_UNIX_DOMAIN_SOCKETS],
AH_TEMPLATE([ACE_LACKS_UNIX_SIGNALS],
[Platform lacks full signal support (e.g., Win32 and Chorus).])
AH_TEMPLATE([ACE_LACKS_UTSNAME_T],
[Platform lacks struct utsname (e.g., Win32 and VxWorks)])
AH_TEMPLATE([ACE_MAIN],
[Renames "main (int, char *[])", for platforms such as g++/VxWorks
that don't allow main. Requires the use of
@@ -973,4 +913,4 @@ dnl ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
dnl ACE_IMPORT_SINGLETON_DECLARATION(T)
dnl ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
]) dnl End ACE_PREP_CONFIG_HEADER
]) dnl End ACE_PREP_CONFIG_HEADER