mirror of https://gitee.com/bigwinds/arangodb
Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1
This commit is contained in:
commit
7e3e6ecfc7
|
@ -11,6 +11,7 @@ OPTIONS="--disable-dependency-tracking --disable-relative"
|
|||
PREFIX="--prefix=/usr --localstatedir=/var --sysconfdir=/etc"
|
||||
RESULTS="arangod arangosh arangoimp"
|
||||
USE_ICECC="no"
|
||||
EXTRA_MAKE_OPTIONS=""
|
||||
|
||||
export CPPFLAGS=""
|
||||
export LDFLAGS=""
|
||||
|
@ -104,7 +105,7 @@ case $TRI_OS_LONG in
|
|||
OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --enable-all-in-one-icu --disable-mruby"
|
||||
LDD_INFO="yes"
|
||||
# bugfix for readline on CentOS 5:
|
||||
export LIBS="-lncurses"
|
||||
export READLINE_LDFLAGS="-lncurses"
|
||||
;;
|
||||
|
||||
Linux-Ubuntu-*)
|
||||
|
@ -159,9 +160,6 @@ echo
|
|||
|
||||
./configure $PREFIX $OPTIONS || exit 1
|
||||
|
||||
# bugfix for readline on CentOS 5:
|
||||
unset LIBS
|
||||
|
||||
echo
|
||||
echo "########################################################"
|
||||
echo "compile:"
|
||||
|
|
Loading…
Reference in New Issue