diff --git a/Makefile.all-in-one b/Makefile.all-in-one
index 5e988c2817..2f5a616ebb 100644
--- a/Makefile.all-in-one
+++ b/Makefile.all-in-one
@@ -4,9 +4,9 @@
 ## LIBEV
 ################################################################################
 
-BUILT_SOURCES += @top_srcdir@/3rdParty/libev/.libs/libev.a
+BUILT_SOURCES += @LIBEV_LIBS@
 
-@top_srcdir@/3rdParty/libev/.libs/libev.a:
+@LIBEV_LIBS@:
 	@echo
 	@echo "--------------------------------------------------------------------------------"
 	@echo "BUILDING LIBEV"
@@ -34,21 +34,9 @@ if ENABLE_32BIT
 V8_BUILD_VERSION=ia32.release
 endif
 
-if ENABLE_DARWIN
+BUILT_SOURCES += $(V8_LIBS)
 
-V8_BUILT_SOURCES = \
-	@top_srcdir@/3rdParty/V8//libv8.a \
-else
-
-V8_BUILT_SOURCES = \
-	@top_srcdir@/3rdParty/V8/out/$(V8_BUILD_VERSION)/libv8_base.a \
-	@top_srcdir@/3rdParty/V8/out/$(V8_BUILD_VERSION)/libv8_nosnapshot.a
-
-endif
-
-BUILT_SOURCES += $(V8_BUILT_SOURCE)
-
-$(V8_BUILT_SOURCE):
+$(V8_LIBS):
 	@echo
 	@echo "--------------------------------------------------------------------------------"
 	@echo "BUILDING V8"
diff --git a/m4/all-in-one.v8 b/m4/all-in-one.v8
index 444feb819e..50b9d747ac 100644
--- a/m4/all-in-one.v8
+++ b/m4/all-in-one.v8
@@ -7,10 +7,14 @@ dnl ----------------------------------------------------------------------------
 V8_CPPFLAGS="-I${srcdir}/3rdParty/V8/include"
 V8_LDFLAGS=""
 
-if text "x$tr_BITS" == "x64";  then
-  V8_LIBS="${srcdir}/3rdParty/V8/out/x64.release/libv8_base.a ${srcdir}/3rdParty/V8/out/x64.release/libv8_nosnapshot.a"
+if test "x$tr_DARWIN" == xyes;  then
+  V8_LIBS="${srcdir}/3rdParty/V8/libv8.a"
 else
-  V8_LIBS="${srcdir}/3rdParty/V8/out/ia32.release/libv8_base.a ${srcdir}/3rdParty/V8/out/ia32.release/libv8_nosnapshot.a"
+  if test "x$tr_BITS" == x64;  then
+    V8_LIBS="${srcdir}/3rdParty/V8/out/x64.release/libv8_base.a ${srcdir}/3rdParty/V8/out/x64.release/libv8_nosnapshot.a"
+  else
+    V8_LIBS="${srcdir}/3rdParty/V8/out/ia32.release/libv8_base.a ${srcdir}/3rdParty/V8/out/ia32.release/libv8_nosnapshot.a"
+  fi
 fi
 
 TRI_V8_VERSION="3.9.4.0"
diff --git a/m4/configure.32bit b/m4/configure.32bit
index a219f8fa4b..02c02f4bfb 100644
--- a/m4/configure.32bit
+++ b/m4/configure.32bit
@@ -12,7 +12,7 @@ case $target_cpu in
     ;;
 esac
 
-if text "x$tr_BITS" == "x64";  then
+if test "x$tr_BITS" == "x64";  then
   AC_ARG_ENABLE(32bit,
     AS_HELP_STRING([--enable-32bit], [force 32bit compilation (default: no)]),
 
@@ -34,7 +34,7 @@ dnl ----------------------------------------------------------------------------
 dnl informational output
 dnl -----------------------------------------------------------------------------------------
 
-if text "x$tr_BITS" == "x64";  then
+if test "x$tr_BITS" == "x64";  then
   if test "x$tr_32BIT" = xyes;  then
     BASIC_INFO="$BASIC_INFO|32bit: enabled"
   else
@@ -42,4 +42,4 @@ if text "x$tr_BITS" == "x64";  then
   fi
 else
   BASIC_INFO="$BASIC_INFO|32bit: enabled"
-fi
\ No newline at end of file
+fi
diff --git a/m4/configure.basics b/m4/configure.basics
index 42bf8aa4a2..8c701f7dd5 100644
--- a/m4/configure.basics
+++ b/m4/configure.basics
@@ -12,6 +12,16 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
+tr_DARWIN="no"
+
+case $target in
+  *-apple-darwin*)
+    tr_DARWIN="yes"
+    ;;
+esac
+
+AM_CONDITIONAL(ENABLE_DARWIN, test "x$tr_DARWIN" = xyes)
+
 dnl -----------------------------------------------------------------------------------------
 dnl use automake to generate Makfile.in
 dnl -----------------------------------------------------------------------------------------
@@ -36,8 +46,6 @@ case $target in
     list_cc="[gcc-4 gcc-3 gcc cc]"
     list_cxx="[g++-4 g++-3 g++ cxx]"
 
-    tr_DARWIN="yes"
-
     ;;
 
   *) 
@@ -47,8 +55,6 @@ case $target in
     ;;
 esac
 
-AM_CONDITIONAL(ENABLE_DARWIN, "x$tr_DARWIN" = "xyes")
-
 AC_PROG_CXXCPP
 AC_PROG_CC($list_cc)
 AC_PROG_CXX($list_cxx)