*** ../VirtualBox-3.1.6_OSE.orig/configure.vbs	2010-03-25 14:54:16.000000000 -0500
--- ./configure.vbs	2010-04-01 18:27:00.466397900 -0500
***************
*** 683,693 ****
           g_strPathkBuildBin = g_strPathkBuild & "/bin/win.x86"
        else ' boldly assumes there is only x86 and amd64.
           g_strPathkBuildBin = g_strPathkBuild & "/bin/win.amd64"
!          if FileExists(g_strPathkBuild & "/kmk.exe") = False then
              g_strPathkBuildBin = g_strPathkBuild & "/bin/win.x86"
           end if
        end if
!       if FileExists(g_strPathkBuild & "/kmk.exe") = False then
           g_strPathkBuildBin = g_strPathkBuild & "/bin/win.x86"
        end if
     end if
--- 683,693 ----
           g_strPathkBuildBin = g_strPathkBuild & "/bin/win.x86"
        else ' boldly assumes there is only x86 and amd64.
           g_strPathkBuildBin = g_strPathkBuild & "/bin/win.amd64"
!          if FileExists(g_strPathkBuildbin & "/kmk.exe") = False then
              g_strPathkBuildBin = g_strPathkBuild & "/bin/win.x86"
           end if
        end if
!       if FileExists(g_strPathkBuildbin & "/kmk.exe") = False then
           g_strPathkBuildBin = g_strPathkBuild & "/bin/win.x86"
        end if
     end if
***************
*** 2126,2133 ****
     CheckForWin2k3DDK strOptDDK
     CheckForMidl
     CheckForDirectXSDK strOptDXSDK
!    CheckForMingW strOptMingw, strOptW32API
!    CheckForlibSDL strOptlibSDL
     ' Don't check for these libraries by default as they are part of OSE
     ' Using external libs can add a dependency to iconv
     if (strOptXml2 <> "") then
--- 2126,2133 ----
     CheckForWin2k3DDK strOptDDK
     CheckForMidl
     CheckForDirectXSDK strOptDXSDK
! '   CheckForMingW strOptMingw, strOptW32API
! '   CheckForlibSDL strOptlibSDL
     ' Don't check for these libraries by default as they are part of OSE
     ' Using external libs can add a dependency to iconv
     if (strOptXml2 <> "") then
***************
*** 2136,2144 ****
     if (strOptXslt <> "") then
        CheckForXslt strOptXslt
     end if
!    CheckForSsl strOptSsl
!    CheckForCurl strOptCurl
!    CheckForQt4 strOptQt4
     if (strOptPython <> "") then
       CheckForPython strOptPython
     end if
--- 2136,2144 ----
     if (strOptXslt <> "") then
        CheckForXslt strOptXslt
     end if
! '   CheckForSsl strOptSsl
! '   CheckForCurl strOptCurl
! '   CheckForQt4 strOptQt4
     if (strOptPython <> "") then
       CheckForPython strOptPython
     end if
*** ../VirtualBox-3.1.6_OSE.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2010-03-25 14:54:35.000000000 -0500
--- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk	2010-04-02 02:05:24.112027000 -0500
***************
*** 212,220 ****
--- 212,226 ----
  $(VBOX_PATH_CROGL_GENFILES)/getprocaddress.c: $(PATH_SUB_CURRENT)/windows_getprocaddress.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
  	$(call MSG_GENERATE,python,$@,$<)
  	$(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
+ ifeq ($(KBUILD_TARGET_ARCH),amd64)
+ $(VBOX_PATH_CROGL_GENFILES)/cropengl.def: $(PATH_SUB_CURRENT)/defs_nostacksize.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
+ 	$(call MSG_GENERATE,python,$@,$<)
+ 	$(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
+ else
  $(VBOX_PATH_CROGL_GENFILES)/cropengl.def: $(PATH_SUB_CURRENT)/defs.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
  	$(call MSG_GENERATE,python,$@,$<)
  	$(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
+ endif
  $(VBOX_PATH_CROGL_GENFILES)/cr_gl.h: $(PATH_SUB_CURRENT)/cr_gl.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
  	$(call MSG_GENERATE,python,$@,$<)
  	$(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)