Index: /trunk/configure
===================================================================
--- /trunk/configure	(revision 30997)
+++ /trunk/configure	(revision 30998)
@@ -74,4 +74,5 @@
 WITH_XPCOM=1
 WITH_PYTHON=1
+WITH_JAVA=1
 WITH_VMMRAW=1
 WITH_LIBIDL=1
@@ -1815,5 +1816,5 @@
 check_python()
 {
-  test_header "python support"
+  test_header "Python support"
 
   # On darwin this is a on/off decision only
@@ -1881,4 +1882,14 @@
 
 #
+# Check for Java
+#
+check_java()
+{
+  test_header "Java support"
+  log_success
+}
+
+
+#
 # Setup wine
 #
@@ -2055,4 +2066,5 @@
 [ $WITH_XPCOM   -eq 1 ] && echo "  --disable-xpcom          disable XPCOM and related stuff"
 [ $WITH_PYTHON  -eq 1 ] && echo "  --disable-python         disable python bindings"
+[ $WITH_JAVA    -eq 1 ] && echo "  --disable-java           disable java 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"
@@ -2187,4 +2199,7 @@
     --disable-python)
       [ $WITH_PYTHON -eq 1 ] && WITH_PYTHON=0
+      ;;
+    --disable-java)
+      [ $WITH_JAVA -eq 1 ] && WITH_JAVA=0
       ;;
     --disable-vmmraw)
@@ -2389,11 +2404,12 @@
   cnf_append "VBOX_GUI_USE_QGL" ""
 fi
-[ $WITH_XPCOM -eq 0 ]     && cnf_append "VBOX_WITH_MAIN" ""
-[ $WITH_QT4 -eq 0   ]     && cnf_append "VBOX_WITH_QTGUI" ""
-[ $WITH_SDL_TTF -eq 0 ]   && cnf_append "VBOX_WITH_SECURELABEL" ""
-[ $WITH_PYTHON -eq 0 ]    && cnf_append "VBOX_WITH_PYTHON" ""
+[ $WITH_XPCOM     -eq 0 ] && cnf_append "VBOX_WITH_MAIN" ""
+[ $WITH_QT4       -eq 0 ] && cnf_append "VBOX_WITH_QTGUI" ""
+[ $WITH_SDL_TTF   -eq 0 ] && cnf_append "VBOX_WITH_SECURELABEL" ""
+[ $WITH_PYTHON    -eq 0 ] && cnf_append "VBOX_WITH_PYTHON" ""
+[ $WITH_JAVA      -eq 0 ] && cnf_append "VBOX_WITH_JXPCOM" ""
 [ $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" ""
+[ $WITH_VMMRAW    -eq 0 ] && cnf_append "VBOX_WITH_RAW_MODE" ""
 
 # Darwin-specific
@@ -2432,4 +2448,5 @@
 [ $WITH_QT4    -eq 1 ] && check_qt4
 [ $WITH_PYTHON -eq 1 ] && check_python
+[ $WITH_JAVA   -eq 1 ] && check_java
 
 # PulseAudio