Index: configure
===================================================================
--- configure	(revision 7199)
+++ configure	(working copy)
@@ -283,17 +283,6 @@
   DEVDIR_BIN="$DEVDIR/$OS.$BUILD_MACHINE/bin"
   log_success "Determined build machine: $OS.$BUILD_MACHINE, target machine: $OS.$TARGET_MACHINE"
 
-  # Automatically disable XPCOM on darwin.
-  if [ "$OS" = "darwin" -a $WITH_XPCOM -eq 1 ]; then
-    WITH_XPCOM=0
-    WITH_LIBIDL=0
-    WITH_QT=0
-    WITH_SDL=0
-    WITH_SDL_TTF=0
-    WITH_X11=0
-    echo "Disabling checks for XPCOM related components."
-  fi
-
   echo "export BUILD_PLATFORM=\"$OS\"" >> $ENV
   echo "export BUILD_PLATFORM_ARCH=\"$BUILD_MACHINE\"" >> $ENV
   echo "export BUILD_TARGET=\"$OS\"" >> $ENV
@@ -744,7 +733,16 @@
 check_png()
 {
   test_header libpng
-  cat > .tmp_src.cc << EOF
+  if which_wrapper pkg-config > /dev/null; then
+    libpng_ver=`pkg-config libpng --modversion 2>> $LOG`
+    if [ $? -ne 0 ]; then
+      log_failure "not found"
+      fail
+    else
+      FLGPNG=`pkg-config libpng --cflags`
+      INCPNG=`strip_I "$FLGPNG"`
+      LIBPNG=`pkg-config libpng --libs`
+      cat > .tmp_src.cc << EOF
 #include <cstdio>
 #include <png.h>
 extern "C" int main(void)
@@ -759,14 +757,17 @@
 #endif
 }
 EOF
-  [ -n "$INCPNG" ] && I_INCPNG=`prefix_I "$INCPNG"`
-#  if test_compile "$LIBPNG $I_INCPNG" libpng libpng nofatal; then
-  if test_compile "$LIBPNG $I_INCPNG" libpng libpng; then
-#    if test_execute nofatal; then
-    if test_execute; then
-      cnf_append "SDK_VBOX_LIBPNG_LIBS" "`strip_l "$LIBPNG"`"
-      cnf_append "SDK_VBOX_LIBPNG_INCS" "$INCPNG"
+      [ -n "$INCPNG" ] && I_INCPNG=`prefix_I "$INCPNG"`
+      if test_compile "$LIBPNG $I_INCPNG" libpng libpng; then
+        if test_execute; then
+          cnf_append "SDK_VBOX_LIBPNG_LIBS" "`strip_l "$LIBPNG"`"
+          cnf_append "SDK_VBOX_LIBPNG_INCS" "$INCPNG"
+        fi
+      fi
     fi
+  else
+    log_failure "pkg-config not found"
+    fail
   fi
 }
 
@@ -844,7 +845,7 @@
 #include <cstdio>
 #include <SDL/SDL.h>
 #include <SDL/SDL_main.h>
-extern "C" int main(void)
+extern "C" int main(int argc, char **argv)
 {
   printf("found version %d.%d.%d",
          SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL);
Index: Config.kmk
===================================================================
--- Config.kmk	(revision 7199)
+++ Config.kmk	(working copy)
@@ -413,10 +413,6 @@
  VBOX_WITH_DOCS=
  VBOX_WITH_TESTSUITE=
  VBOX_WITH_INTEL_PXE=
- ifeq ($(BUILD_TARGET),darwin)
-  # Qt/Mac v3.3.x requires patching to work for us.
-  VBOX_WITH_QTGUI=
- endif
  ifneq ($(BUILD_TARGET),linux)
   # Only the Linux installer is public
   VBOX_WITH_INSTALLER=
@@ -1321,17 +1317,16 @@
  LIB_QT_PRL ?= $(lastword $(sort $(wildcard $(VBOX_PATH_QT)/lib/*qt*.prl)))
  QTDIR := $(VBOX_PATH_QT)
 else ifeq ($(BUILD_TARGET),darwin)
+ ifndef QTDIR
+  QTDIR := $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/v*))
+  QTDIR := $(call lastword,$(QTDIR))
+ endif
  ifndef VBOX_PATH_QT
-  VBOX_PATH_QT := $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v3.*)))
-  VBOX_PATH_QT ?= $(PATH_DEVTOOLS_TRG)/qt/v3.3.8-r1
+  VBOX_PATH_QT := $(QTDIR)
  endif
  VBOX_MUST_INSTALL_LIB_QT ?= 1
  LIB_QT ?= $(VBOX_PATH_QT)/lib/libqt-mt.3.dylib
  LIB_QTMAIN ?= $(NO_SUCH_VARIABLE)
- ifndef QTDIR
-  QTDIR := $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/v*))
-  QTDIR := $(call lastword,$(QTDIR))
- endif
 else
  ifndef QTDIR
   ifndef VBOX_PATH_QT