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

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2012-09-25 11:52:26 +02:00
parent f4e8c8cf9c 9d48bbe32a
commit fa7ef5bc16
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -166,8 +166,11 @@ sbin_PROGRAMS = \
bin_PROGRAMS = \
bin/arangosh \
bin/arangoimp \
bin/arangob
bin/arangoimp
if ENABLE_ARANGOB
bin_PROGRAMS += bin/arangob
endif
################################################################################
### @brief uninstalled programs

3
arangosh/Makefile.files
View File

@ -49,6 +49,7 @@ bin_arangoimp_SOURCES = \
################################################################################
### @brief program "arangob"
################################################################################
if ENABLE_ARANGOB
bin_arangob_CPPFLAGS = \
-I@top_srcdir@/arangosh \
@ -67,6 +68,8 @@ bin_arangob_SOURCES = \
arangosh/V8Client/V8ClientConnection.cpp \
arangosh/V8Client/arangob.cpp
endif
################################################################################
## --SECTION-- END-OF-FILE
################################################################################

2
configure.ac
View File

@ -8,6 +8,8 @@ dnl ============================================================================
AC_INIT([triAGENS ArangoDB], [1.0.0], [info@triagens.de], [arangodb], [http://www.arangodb.org])
AM_CONDITIONAL(ENABLE_ARANGOB, test "x$tr_ENABLE_ARANGOB" = xyes)
dnl ----------------------------------------------------------------------------
dnl auxillary directory for install-sh and missing
dnl ----------------------------------------------------------------------------