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-16 17:35:51 +02:00
commit 5efbc9cb07
1 changed files with 21 additions and 10 deletions

View File

@ -54,54 +54,62 @@ case $TRI_OS_LONG in
Linux-ArchLinux*)
echo "Using configuration for Arch Linux"
OPTIONS="$OPTIONS --enable-mruby"
OPTIONS="$OPTIONS --disable-mruby"
LDD_INFO="yes"
RESULTS="$RESULTS arangoirb"
;;
Linux-LinuxMint-13*)
echo "Using configuration for LinuxMint 13"
OPTIONS="$OPTIONS --enable-mruby"
OPTIONS="$OPTIONS --disable-mruby"
LDD_INFO="yes"
RESULTS="$RESULTS arangoirb"
;;
Linux-openSUSE-12*)
echo "Using configuration for openSuSE 12.X"
OPTIONS="$OPTIONS --enable-flex --enable-bison --enable-mruby "
OPTIONS="$OPTIONS --enable-flex --enable-bison --disable-mruby "
LDD_INFO="yes"
RESULTS="$RESULTS arangoirb"
;;
Linux-openSUSE-11*)
echo "Using configuration for openSuSE 11.X"
OPTIONS="$OPTIONS --enable-mruby"
OPTIONS="$OPTIONS --disable-mruby"
LDD_INFO="yes"
RESULTS="$RESULTS arangoirb"
;;
Linux-Debian-6*)
echo "Using configuration for Debian"
OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --enable-mruby"
OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --disable-mruby"
LDD_INFO="yes"
RESULTS="$RESULTS arangoirb"
;;
Linux-Debian*)
echo "Using configuration for Debian"
OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --enable-all-in-one-icu --enable-mruby"
OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --enable-all-in-one-icu --disable-mruby"
LDD_INFO="yes"
;;
Linux-CentOS-*)
Linux-CentOS-6*)
echo "Using configuration for Centos"
OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --enable-all-in-one-icu --enable-mruby"
OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --enable-all-in-one-icu --disable-mruby"
LDD_INFO="yes"
;;
Linux-CentOS-5*)
echo "Using configuration for Centos"
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"
;;
Linux-Ubuntu-*)
echo "Using configuration for Ubuntu"
OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --enable-mruby"
OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --disable-mruby"
LDD_INFO="yes"
RESULTS="$RESULTS arangoirb"
;;
@ -110,7 +118,7 @@ case $TRI_OS_LONG in
echo "Using configuration for DARWIN"
CPPFLAGS='-isystem /usr/include -isystem /opt/local/include -Wno-deprecated-declarations'
LDFLAGS='-L/usr/lib -L/opt/local/lib' # need to use OpenSSL from system
OPTIONS="$OPTIONS --enable-mruby"
OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --enable-all-in-one-icu --disable-mruby"
RESULTS="$RESULTS arangoirb"
;;
@ -147,6 +155,9 @@ echo
./configure $PREFIX $OPTIONS || exit 1
# bugfix for readline on CentOS 5:
unset LIBS
echo
echo "########################################################"
echo "compile:"