Imported Upstream version 3.1.4-dfsgupstream/3.1.4-dfsg

1 files changed, 6 insertions, 3 deletions

diff --git a/configure b/configure
index 2430c3537..2a29643ea 100755
--- a/configure
+++ b/configure
@@ -612,7 +612,7 @@ check_mkisofs()
 
 
 #
-# Check for libxml2, needed by VBoxSettings
+# Check for libxml2, needed by VBoxSettings and Runtime.
 # 2.6.24 is known to NOT work, 2.6.26 is known to work (there is no 2.6.25 release)
 #
 check_libxml2()
@@ -2114,6 +2114,9 @@ for option in $*; do
     --disable-pulse)
       [ $WITH_PULSE -eq 1 ] && WITH_PULSE=0
       ;;
+    --enable-pulse)
+      WITH_PULSE=2
+      ;;
     --disable-dbus)
       [ $WITH_DBUS -eq 1 ] && WITH_DBUS=0
       ;;
@@ -2297,7 +2300,7 @@ check_gcc
 
 # the libraries
 [ "$OS" != "darwin"  ] && check_pthread
-[ $WITH_XPCOM  -eq 1 ] && check_libxml2
+check_libxml2
 [ $WITH_XPCOM  -eq 1 ] && check_libxslt
 [ $WITH_LIBIDL -eq 1 ] && check_libidl
 check_ssl
@@ -2334,7 +2337,7 @@ if [ "$OS" = "linux" ]; then
   fi
   if [ $WITH_PULSE -eq 1 ]; then
     check_pulse
-  else
+  elif [ $WITH_PULSE -eq 0 ]; then
     cnf_append "VBOX_WITH_PULSE" ""
   fi
   if [ $WITH_DBUS -eq 0 ]; then