mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-18 01:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8415] Implement --enable-builtin-ace option for explicit select builtin/system ACE.

Browse source 
* --enable-builtin-ace (default) set use builting in mangos sources ACE version build and use
* --disable-builtin-ace set use installed in system ACE version (if any) or
  error if no system version installed. This let easy use system version of ACE
  if it prefered by some reasons (for example 5.5.2 ACE package at 6.x FreeBSD)
* This also fix proper detection Stack_Trace.h existance in both cases.

More proper header existance check base at patch suggested by Plaes.
Thanks to Splinter for testing.
This commit is contained in:
VladimirMangos 2009-08-24 13:54:13 +04:00
parent 9f01551210
commit bee8a0ddce
2 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

32
configure.ac
View file

@ -201,16 +201,34 @@ AC_TYPE_SIGNAL
AC_FUNC_VPRINTF AC_FUNC_VPRINTF
AC_CHECK_FUNCS([atexit ftime gethostbyaddr gethostbyname gethostname gettimeofday memmove memset pow realpath select socket sqrt strchr strdup strerror strstr]) AC_CHECK_FUNCS([atexit ftime gethostbyaddr gethostbyname gethostname gettimeofday memmove memset pow realpath select socket sqrt strchr strdup strerror strstr])
PKG_CHECK_MODULES(ACE, [ACE >= 5.5.2], [need_to_build_ace=no], [need_to_build_ace=yes])
if test X$need_to_build_ace = Xyes ; then # Check for use buildtin ACE sources
AC_ARG_ENABLE(builtin_ace, AC_HELP_STRING([--enable-builtin-ace], [turn on/off using builtin ACE sources]))
enable_builtin_ace_support=yes
if test "x$enable_builtin_ace" = "xno"; then
PKG_CHECK_MODULES(ACE, [ACE >= 5.5.2], [need_builtin_ace=no], [need_builtin_ace=yes])
if test X$need_builtin_ace = Xyes ; then
AC_MSG_ERROR([You need to install ACE package or use built-in ACE sources])
fi
enable_builtin_ace_support=no
fi
if test X$enable_builtin_ace_support = Xno; then
# old ace versions might not have ace/Stack_Trace.h...
AC_LANG_PUSH([C++])
AC_CHECK_HEADERS([ace/Stack_Trace.h])
AC_LANG_POP
else
# ...but we certainly have it in our included version
AC_DEFINE(HAVE_ACE_STACK_TRACE_H)
ACE_INCLUDES="-I\$(top_srcdir)/dep/ACE_wrappers -I\$(top_builddir)/dep/ACE_wrappers" ACE_INCLUDES="-I\$(top_srcdir)/dep/ACE_wrappers -I\$(top_builddir)/dep/ACE_wrappers"
ACE_LIBS="\$(top_builddir)/dep/ACE_wrappers/ace/libACE.la" ACE_LIBS="\$(top_builddir)/dep/ACE_wrappers/ace/libACE.la"
fi fi
AM_CONDITIONAL([MANGOS_BUILD_ACE], [test X$need_to_build_ace = Xyes]) AM_CONDITIONAL([MANGOS_BUILD_ACE], [test X$enable_builtin_ace_support = Xyes])
# old ace versions not have ace/Stack_Trace.h
AC_CHECK_HEADERS([ace/Stack_Trace.h])
## Unify all additional includes/libs in one variable. ## Unify all additional includes/libs in one variable.
# TODO this looks kinda ugly, but when we add m4 folder I will make it look very pritey ( by Derex ). # TODO this looks kinda ugly, but when we add m4 folder I will make it look very pritey ( by Derex ).
@ -261,7 +279,7 @@ AC_CONFIG_FILES([
]) ])
## Configure ACE, if needed ## Configure ACE, if needed
if test X$need_to_build_ace = Xyes; then if test X$enable_builtin_ace_support = Xyes; then
AC_CONFIG_SUBDIRS([dep/ACE_wrappers]) AC_CONFIG_SUBDIRS([dep/ACE_wrappers])
fi fi

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8414" #define REVISION_NR "8415"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__