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

added --enable-internal-go

This commit is contained in:
Frank Celler 2014-02-27 16:50:06 +01:00
parent 2ca78ea168
commit 134ec1b2bb
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdParty/Makefile.etcd vendored
View File

@ -15,7 +15,11 @@
@echo "--------------------------------------------------------------------------------" @echo "--------------------------------------------------------------------------------"
@echo @echo
if ENABLE_INTERNAL_GO
cd @top_srcdir@/3rdParty/etcd && GOROOT="`pwd`/../go-$(TRI_BITS)/" PATH="`pwd`/../go-$(TRI_BITS)/bin:$$PATH" ./build
else
cd @top_srcdir@/3rdParty/etcd && ./build cd @top_srcdir@/3rdParty/etcd && ./build
endif
cp @top_srcdir@/3rdParty/etcd/bin/etcd @top_srcdir@/bin/etcd-arango cp @top_srcdir@/3rdParty/etcd/bin/etcd @top_srcdir@/bin/etcd-arango
@echo @echo

12
configure.ac
View File

@ -129,6 +129,18 @@ AC_ARG_ENABLE(all-in-one-etcd,
AM_CONDITIONAL(ENABLE_ALL_IN_ONE_ETCD, test "x$tr_ALL_IN_ONE_ETCD" = xyes) AM_CONDITIONAL(ENABLE_ALL_IN_ONE_ETCD, test "x$tr_ALL_IN_ONE_ETCD" = xyes)
dnl ----------------------------------------------------------------------------
dnl GO
dnl ----------------------------------------------------------------------------
AC_ARG_ENABLE(internal-go,
AS_HELP_STRING([--enable-internal-go], [use go binaries from 3rdParty directory (default: no)]),
[tr_INTERNAL_GO="${enableval:-yes}"],
[tr_INTERNAL_GO=no]
)
AM_CONDITIONAL(ENABLE_INTERNAL_GO, test "x$tr_INTERNAL_GO" = xyes)
dnl ============================================================================ dnl ============================================================================
dnl --SECTION-- OPTIONS dnl --SECTION-- OPTIONS
dnl ============================================================================ dnl ============================================================================