Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Get rid of switch --enable-cluster. 

Always compile with TRI_ENABLE_CLUSTER enabled.
This commit is contained in:
Max Neunhoeffer 2014-02-25 12:46:10 +01:00
parent f3d12fdd35
commit cc75da03dd
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -105,6 +105,7 @@ endif ()
math(EXPR BITS "8*${CMAKE_SIZEOF_VOID_P}") math(EXPR BITS "8*${CMAKE_SIZEOF_VOID_P}")
add_definitions("-DTRI_BITS=${BITS}") add_definitions("-DTRI_BITS=${BITS}")
add_definitions("-DTRI_ENABLE_CLUSTER=1")
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
## --SECTION-- OPTIONS ## --SECTION-- OPTIONS

2
GNUmakefile
View File

@ -252,7 +252,7 @@ pack-winXX-cmake:
### @brief cmake build ### @brief cmake build
################################################################################ ################################################################################
.PHONY: cmake-setpup .PHONY: cmake-setup
cmake-setup: cmake-setup:
test -d Build || mkdir Build test -d Build || mkdir Build

13
m4/configure.cluster
View File

@ -4,17 +4,8 @@ dnl ----------------------------------------------------------------------------
dnl --SECTION-- CLUSTER dnl --SECTION-- CLUSTER
dnl ---------------------------------------------------------------------------- dnl ----------------------------------------------------------------------------
AC_ARG_ENABLE(cluster, AC_DEFINE_UNQUOTED(TRI_ENABLE_CLUSTER, 1, [always true])
AS_HELP_STRING([--enable-cluster], [enable cluster features (default: yes)]), AM_CONDITIONAL(ENABLE_CLUSTER, [test yes = yes])
[tr_CLUSTER="$enableval"],
[tr_CLUSTER="yes"]
)
if test "x$tr_CLUSTER" = xyes; then
AC_DEFINE_UNQUOTED(TRI_ENABLE_CLUSTER, 1, [true if cluster is enabled])
fi
AM_CONDITIONAL(ENABLE_CLUSTER, test "x$tr_CLUSTER" = xyes)
dnl ---------------------------------------------------------------------------- dnl ----------------------------------------------------------------------------
dnl --SECTION-- END-OF-FILE dnl --SECTION-- END-OF-FILE