Merge branch 'master' of github.com:triAGENS/AvocadoDB

RestServer/install-manual.dox

@@ -244,6 +244,8 @@
 /// - the GNU ncurses library in version 5 or 6
 /// - boost header files, at least version 1.33
 ///
+/// To compile Google V8 yourself, you will also need SCons.
+///
 /// Some distributions, for example Centos 5, provide only very out-dated
 /// versions of FLEX, BISON, and the V8 engine. In that case you need to compile
 /// newer versions of the programs and/or libraries.
@@ -252,10 +254,11 @@
 ///
 /// - boost development package (see www.boost.org)
 /// - Google's V8 engine (see code.google.com/p/v8)
+/// - SCons for compiling V8 (see www.scons.org)
 /// - libev (see software.schmorp.de/pkg/libev.html) 
 ///
 /// if neccessary.  Most linux systems already supply RPM or DEP for
-/// there packages. Please note that you have to install the
+/// these packages. Please note that you have to install the
 /// development packages.
 ///
 /// @subsection DownloadSourceDevel Download the Source

configure

@@ -612,6 +612,7 @@ BOOST_CPPFLAGS
 V8_LIBS
 V8_LDFLAGS
 V8_CPPFLAGS
+SCONS
 LIBEV_LIBS
 LIBEV_LDFLAGS
 LIBEV_CPPFLAGS
@@ -8329,6 +8330,50 @@ FLAG_INFO="$FLAG_INFO|."
 
 
 
+# Extract the first word of "scons", so it can be a program name with args.
+set dummy scons; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_SCONS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$SCONS"; then
+  ac_cv_prog_SCONS="$SCONS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_SCONS="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+SCONS=$ac_cv_prog_SCONS
+if test -n "$SCONS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SCONS" >&5
+$as_echo "$SCONS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+if test "x$SCONS" != "xyes"; then
+  as_fn_error $? "Please install scons for building V8" "$LINENO" 5
+fi
+
+
+
 V8_CPPFLAGS="-I${srcdir}/3rdParty/V8/include"
 V8_LDFLAGS=""
 
@@ -8865,6 +8910,48 @@ $as_echo "$as_me: WARNING: cannot compute V8 version number, old autoconf versio
 fi
 
 
+# Extract the first word of "scons", so it can be a program name with args.
+set dummy scons; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_SCONS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$SCONS"; then
+  ac_cv_prog_SCONS="$SCONS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_SCONS="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+SCONS=$ac_cv_prog_SCONS
+if test -n "$SCONS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SCONS" >&5
+$as_echo "$SCONS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+if test "x$SCONS" != "xyes"; then
+  as_fn_error $? "Please install scons for building V8" "$LINENO" 5
+fi
+
 
 LIBS="$SAVE_LIBS"
 LDFLAGS="$SAVE_LDFLAGS"

m4/external.v8

@@ -75,7 +75,7 @@ LDFLAGS="$LDFLAGS ${V8_LDFLAGS}"
 CPPFLAGS="$CPPFLAGS ${V8_CPPFLAGS}"
 
 dnl -----------------------------------------------------------------------------------------
-dnl grep libev version number
+dnl grep V8 version number
 dnl -----------------------------------------------------------------------------------------
 
 if test "$cross_compiling" = yes; then :
@@ -130,6 +130,15 @@ _ACEOF
   fi
 fi
 
+dnl -----------------------------------------------------------------------------------------
+dnl check for presence of scons (required when building V8)
+dnl -----------------------------------------------------------------------------------------
+
+AC_CHECK_PROG(SCONS, scons, yes)
+
+if test "x$SCONS" != "xyes"; then
+  AC_MSG_ERROR([Please install scons for building V8])
+fi
 
 dnl -----------------------------------------------------------------------------------------
 dnl restore flags