diff --git a/m4/all-in-one.boost b/m4/all-in-one.boost
new file mode 100644
index 0000000000..aee8b05387
--- /dev/null
+++ b/m4/all-in-one.boost
@@ -0,0 +1,37 @@
+dnl -*- mode: Autoconf; -*-
+
+dnl -----------------------------------------------------------------------------------------
+dnl option for BOOST support
+dnl -----------------------------------------------------------------------------------------
+
+BOOST_CPPFLAGS="-I${srcdir}/3rdParty/boost_1_48_0/include"
+BOOST_LDFLAGS=""
+BOOST_LIBS=""
+
+TRI_BOOST_VERSION="1.48.0"
+
+dnl -----------------------------------------------------------------------------------------
+dnl add substitutions
+dnl -----------------------------------------------------------------------------------------
+
+AC_SUBST(BOOST_CPPFLAGS)
+AC_SUBST(BOOST_LDFLAGS)
+AC_SUBST(BOOST_LIBS)
+
+BOOST_CPPFLAGS="${BOOST_CPPFLAGS} -DTRI_BOOST_VERSION='\"${TRI_BOOST_VERSION}\"'"
+
+dnl -----------------------------------------------------------------------------------------
+dnl informational output
+dnl -----------------------------------------------------------------------------------------
+
+LIB_INFO="$LIB_INFO|BOOST VERSION: $TRI_BOOST_VERSION"
+
+FLAG_INFO="$FLAG_INFO|BOOST_CPPFLAGS: ${BOOST_CPPFLAGS}"
+FLAG_INFO="$FLAG_INFO|BOOST_LDFLAGS:  ${BOOST_LDFLAGS}"
+FLAG_INFO="$FLAG_INFO|BOOST_LIBS:     ${BOOST_LIBS}"
+FLAG_INFO="$FLAG_INFO|."
+
+dnl Local Variables:
+dnl mode: outline-minor
+dnl outline-regexp: "^\\(dnl --SECTION--\\)"
+dnl End:
diff --git a/m4/all-in-one.libev b/m4/all-in-one.libev
new file mode 100644
index 0000000000..c5b2c8268a
--- /dev/null
+++ b/m4/all-in-one.libev
@@ -0,0 +1,39 @@
+dnl -*- mode: Autoconf; -*-
+
+dnl -----------------------------------------------------------------------------------------
+dnl option for LIBEV support
+dnl -----------------------------------------------------------------------------------------
+
+LIBEV_CPPFLAGS="-I${srcdir}/3rdParty/libev"
+LIBEV_LDFLAGS=""
+LIBEV_LIBS="${srcdir}/3rdParty/libev/.libs/libev.a"
+
+TRI_LIBEV_VERSION="4.11"
+
+dnl -----------------------------------------------------------------------------------------
+dnl add substitutions
+dnl -----------------------------------------------------------------------------------------
+
+AM_CONDITIONAL(ENABLE_LIBEV, test "xyes" = xyes)
+
+AC_SUBST(LIBEV_CPPFLAGS)
+AC_SUBST(LIBEV_LDFLAGS)
+AC_SUBST(LIBEV_LIBS)
+
+LIBEV_CPPFLAGS="${LIBEV_CPPFLAGS} -DTRI_LIBEV_VERSION='\"${TRI_LIBEV_VERSION}\"'"
+
+dnl -----------------------------------------------------------------------------------------
+dnl informational output
+dnl -----------------------------------------------------------------------------------------
+
+LIB_INFO="$LIB_INFO|LIBEV VERSION: ${TRI_LIBEV_VERSION}"
+
+FLAG_INFO="$FLAG_INFO|LIBEV_CPPFLAGS: ${LIBEV_CPPFLAGS}"
+FLAG_INFO="$FLAG_INFO|LIBEV_LDFLAGS:  ${LIBEV_LDFLAGS}"
+FLAG_INFO="$FLAG_INFO|LIBEV_LIBS:     ${LIBEV_LIBS}"
+FLAG_INFO="$FLAG_INFO|."
+
+dnl Local Variables:
+dnl mode: outline-minor
+dnl outline-regexp: "^\\(dnl --SECTION--\\)"
+dnl End:
diff --git a/m4/all-in-one.v8 b/m4/all-in-one.v8
new file mode 100644
index 0000000000..1c79f0db8e
--- /dev/null
+++ b/m4/all-in-one.v8
@@ -0,0 +1,38 @@
+dnl -*- mode: Autoconf; -*-
+
+dnl -----------------------------------------------------------------------------------------
+dnl option for V8 support
+dnl -----------------------------------------------------------------------------------------
+
+V8_CPPFLAGS="-I${srcdir}/3rdParty/V8/include"
+V8_LDFLAGS=""
+V8_LIBS="${srcdir}/3rdParty/V8/out/x64.release/obj.target/tools/gyp/libv8_base.a ${srcdir}/3rdParty/V8/out/x64.release/obj.target/tools/gyp/libv8_nosnapshot.a"
+
+TRI_V8_VERSION="3.9.4.0"
+
+dnl -----------------------------------------------------------------------------------------
+dnl add substitutions
+dnl -----------------------------------------------------------------------------------------
+
+AC_SUBST(V8_CPPFLAGS)
+AC_SUBST(V8_LDFLAGS)
+AC_SUBST(V8_LIBS)
+
+V8_CPPFLAGS="${V8_CPPFLAGS} -DTRI_V8_VERSION='\"${TRI_V8_VERSION}\"'"
+
+dnl -----------------------------------------------------------------------------------------
+dnl informational output
+dnl -----------------------------------------------------------------------------------------
+
+LIB_INFO="$LIB_INFO|V8 VERSION: ${TRI_V8_VERSION}"
+
+FLAG_INFO="$FLAG_INFO|V8_CPPFLAGS: ${V8_CPPFLAGS}"
+FLAG_INFO="$FLAG_INFO|V8_LDFLAGS:  ${V8_LDFLAGS}"
+FLAG_INFO="$FLAG_INFO|V8_LIBS:     ${V8_LIBS}"
+FLAG_INFO="$FLAG_INFO|."
+
+
+dnl Local Variables:
+dnl mode: outline-minor
+dnl outline-regexp: "^\\(dnl --SECTION--\\)"
+dnl End:
diff --git a/m4/configure.32bit b/m4/configure.32bit
index fee29a6fb8..a219f8fa4b 100644
--- a/m4/configure.32bit
+++ b/m4/configure.32bit
@@ -4,23 +4,42 @@ dnl ----------------------------------------------------------------------------
 dnl option for 32bit/64bit compile
 dnl -----------------------------------------------------------------------------------------
 
-AC_ARG_ENABLE(32bit,
-  AS_HELP_STRING([--enable-32bit], [force 32bit compilation (default: no)]),
+tr_BITS=32
 
-  tr_32BIT="$enableval"
+case $target_cpu in
+  x86_64*)
+    tr_BITS=64
+    ;;
+esac
 
-  if test "x$enableval" = xyes;  then
-    CXXFLAGS="$CXXFLAGS -m32"
-    CFLAGS="$CFLAGS -m32"
-    LDFLAGS="$LDFLAGS -m32"
-  fi,
-  tr_32BIT="no"
-)
+if text "x$tr_BITS" == "x64";  then
+  AC_ARG_ENABLE(32bit,
+    AS_HELP_STRING([--enable-32bit], [force 32bit compilation (default: no)]),
+
+    tr_32BIT="$enableval"
+
+    if test "x$enableval" = xyes;  then
+      CXXFLAGS="$CXXFLAGS -m32"
+      CFLAGS="$CFLAGS -m32"
+      LDFLAGS="$LDFLAGS -m32"
+    fi,
+    tr_32BIT="no"
+  )
+fi
+
+AM_CONDITIONAL(ENABLE_64BIT, test "x$tr_BITS" = x64)
+AM_CONDITIONAL(ENABLE_32BIT, test "x$tr_BITS" = x32)
 
 dnl -----------------------------------------------------------------------------------------
 dnl informational output
 dnl -----------------------------------------------------------------------------------------
 
-if test "x$tr_32BIT" = xyes;  then
+if text "x$tr_BITS" == "x64";  then
+  if test "x$tr_32BIT" = xyes;  then
+    BASIC_INFO="$BASIC_INFO|32bit: enabled"
+  else
+    BASIC_INFO="$BASIC_INFO|64bit: enabled"
+  fi
+else
   BASIC_INFO="$BASIC_INFO|32bit: enabled"
-fi
+fi
\ No newline at end of file
diff --git a/m4/external.v8 b/m4/external.v8
index 8520621536..d0de12c861 100644
--- a/m4/external.v8
+++ b/m4/external.v8
@@ -1,7 +1,7 @@
 dnl -*- mode: Autoconf; -*-
 
 dnl -----------------------------------------------------------------------------------------
-dnl option for V8
+dnl option for V8 support
 dnl -----------------------------------------------------------------------------------------
 
 V8_CPPFLAGS=""
@@ -66,6 +66,10 @@ AC_SUBST(V8_CPPFLAGS)
 AC_SUBST(V8_LDFLAGS)
 AC_SUBST(V8_LIBS)
 
+dnl -----------------------------------------------------------------------------------------
+dnl save flags
+dnl -----------------------------------------------------------------------------------------
+
 LIBS="$LIBS ${V8_LIBS}"
 LDFLAGS="$LDFLAGS ${V8_LDFLAGS}"
 CPPFLAGS="$CPPFLAGS ${V8_CPPFLAGS}"
@@ -147,3 +151,8 @@ FLAG_INFO="$FLAG_INFO|V8_CPPFLAGS: ${V8_CPPFLAGS}"
 FLAG_INFO="$FLAG_INFO|V8_LDFLAGS:  ${V8_LDFLAGS}"
 FLAG_INFO="$FLAG_INFO|V8_LIBS:     ${V8_LIBS}"
 FLAG_INFO="$FLAG_INFO|."
+
+dnl Local Variables:
+dnl mode: outline-minor
+dnl outline-regexp: "^\\(dnl --SECTION--\\)"
+dnl End: