1
0
Fork 0

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

This commit is contained in:
Frank Celler 2012-10-20 22:17:22 +02:00
commit 7e3e6ecfc7
1 changed files with 3 additions and 5 deletions

View File

@ -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:"