Index: /trunk/configure
===================================================================
--- /trunk/configure	(revision 26694)
+++ /trunk/configure	(revision 26695)
@@ -78,4 +78,5 @@
 WITH_XPCOM=1
 WITH_PYTHON=1
+WITH_VMMRAW=1
 WITH_LIBIDL=1
 WITH_GSOAP=0
@@ -421,4 +422,8 @@
         [ -z "$CXX64" ] && CXX64="$CXX -m64"
       fi
+      if [ "$TARGET_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 0 ]; then
+        CC32="undefined"
+        CXX32="undefined"
+      fi
       if [ "$CC" != "gcc" ]; then
         cnf_append "TOOL_GCC3_CC"   "$CC"
@@ -433,5 +438,5 @@
         cnf_append "TOOL_GXX3_LD"   "$CXX"
       fi
-      if [ "$CC32" != "gcc -m32" ]; then
+      if [ "$CC32" != "gcc -m32" -a "$CC32" != "undefined" ]; then
         cnf_append "TOOL_GCC32_CC"  "$CC32"
         cnf_append "TOOL_GCC32_AS"  "$CC32"
@@ -440,5 +445,5 @@
         cnf_append "TOOL_GXX32_AS"  "$CC32"
       fi
-      if [ "$CXX32" != "g++ -m32" ]; then
+      if [ "$CXX32" != "g++ -m32" -a "$CXX32" != "undefined" ]; then
         cnf_append "TOOL_GCC32_CXX" "$CXX32"
         cnf_append "TOOL_GXX32_CXX" "$CXX32"
@@ -1988,4 +1993,5 @@
 [ $WITH_XPCOM   -eq 1 ] && echo "  --disable-xpcom          disable XPCOM and related stuff"
 [ $WITH_PYTHON  -eq 1 ] && echo "  --disable-python         disable python bindings"
+[ $WITH_VMMRAW  -eq 1 ] && echo "  --disable-vmmraw         disable VMM raw mode (VT-x/AMD-V mandatory!)"
 [ $WITH_SDL_TTF -eq 1 ] && echo "  --disable-sdl-ttf        disable SDL_ttf detection"
 [ $WITH_ALSA    -eq 1 ] && echo "  --disable-alsa           disable the ALSA sound backend"
@@ -2116,4 +2122,7 @@
     --disable-python)
       [ $WITH_PYTHON -eq 1 ] && WITH_PYTHON=0
+      ;;
+    --disable-vmmraw)
+      [ $WITH_VMMRAW -eq 1 ] && WITH_VMMRAW=0
       ;;
     --disable-sdl-ttf)
@@ -2310,4 +2319,5 @@
 [ $WITH_HARDENING -eq 0 ] && cnf_append "VBOX_WITHOUT_HARDENING" "1"
 [ $WITH_HARDENING -eq 2 ] && cnf_append "VBOX_WITH_HARDENING" "2"
+[ $WITH_VMMRAW -eq 0 ]    && cnf_append "VBOX_WITH_RAW_MODE" ""
 
 # Darwin-specific
@@ -2376,5 +2386,5 @@
   check_libcap
   check_compiler_h
-  [ "$BUILD_MACHINE" = "amd64" ] && check_32bit
+  [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
 fi