mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
This commit is contained in:
commit
7a7136f083
|
@ -90,12 +90,9 @@ bin_arangod_SOURCES = \
|
||||||
arangod/VocBase/voc-shaper.c \
|
arangod/VocBase/voc-shaper.c \
|
||||||
arangod/VocBase/vocbase.c
|
arangod/VocBase/vocbase.c
|
||||||
|
|
||||||
if ENABLE_TRX
|
|
||||||
|
|
||||||
bin_arangod_SOURCES += \
|
bin_arangod_SOURCES += \
|
||||||
arangod/VocBase/versioned-index.c \
|
arangod/VocBase/versioned-index.c \
|
||||||
arangod/VocBase/transaction.c
|
arangod/VocBase/transaction.c
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
if ENABLE_MRUBY
|
if ENABLE_MRUBY
|
||||||
|
|
Loading…
Reference in New Issue