Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 73122)
+++ /trunk/Config.kmk	(revision 73123)
@@ -1196,5 +1196,5 @@
   VBOX_WITH_INSTALLER=
  endif
- # if1of ($(KBUILD_TARGET), win)
+  if1of ($(KBUILD_TARGET), win)
   # Undefine codec libraries which are not needed.
   VBOX_WITH_LIBVPX=
@@ -1203,5 +1203,5 @@
   VBOX_WITH_VIDEOREC=
   VBOX_WITH_AUDIO_VIDEOREC=
- # endif
+  endif
  # branding
  VBOX_BRAND_LICENSE_HTML             := $(PATH_ROOT)/doc/License-gpl-2.0.html
Index: /trunk/configure
===================================================================
--- /trunk/configure	(revision 73122)
+++ /trunk/configure	(revision 73123)
@@ -1638,4 +1638,39 @@
 
 #
+# Check for libopus
+#
+check_libopus()
+{
+  if [ -z "$BUILD_LIBOPUS" ]; then
+    test_header libopus
+    if which_wrapper pkg-config > /dev/null; then
+      libopus_ver=`pkg-config opus --modversion 2>> $LOG`
+      if [ $? -eq 0 ]; then
+        FLGOPUS=`pkg-config opus --cflags`
+        INCOPUS=`strip_I "$FLGOPUS"`
+        LIBOPUS=`pkg-config opus --libs`
+      fi
+      cat > $ODIR.tmp_src.cc << EOF
+#include <cstdio>
+#include <opus/opus.h>
+extern "C" int main(void)
+{
+  OpusEncoder *test;
+  printf("found, OK.\n");
+}
+EOF
+      [ -n "$INCOPUS" ] && I_INCOPUS=`prefix_I "$INCOPUS"`
+      if test_compile "$LIBOPUS $I_INCOPUS" opus opus; then
+        if test_execute; then
+          cnf_append "SDK_VBOX_OPUS_INCS" "$INCOPUS"
+          cnf_append "SDK_VBOX_OPUS_LIBS" "`strip_l "$LIBOPUS"`"
+          fi
+      fi
+    fi
+  fi
+}
+
+
+#
 # Check for libvpx
 #
@@ -2510,4 +2545,7 @@
       WITH_HARDENING=2
       ;;
+    --build-libopus)
+      BUILD_LIBOPUS=1
+      ;;
     --disable-udptunnel)
       WITH_UDPTUNNEL=0
@@ -2734,4 +2772,5 @@
   check_curl
   [ $WITH_LIBVPX -eq 1 ] && check_vpx
+  check_libopus
  [ "$OS" != "darwin"  ] && check_z
   [ "$OS" != "darwin"  ] && check_png
Index: /trunk/src/VBox/Installer/linux/debian/rules
===================================================================
--- /trunk/src/VBox/Installer/linux/debian/rules	(revision 73122)
+++ /trunk/src/VBox/Installer/linux/debian/rules	(revision 73123)
@@ -107,5 +107,6 @@
 	     $(if $(NOWEBSVC),,$(if $(ose),--enable-webservice,)) \
 	     $(if $(VNC),--enable-vnc,) \
-	     --disable-extpack
+	     --disable-extpack \
+	     $(if $(filter DEBIAN_7_0,$(debdist)),--build-libopus,)
 
 bld_flags := AUTOCFG=$(current)/debian/AutoConfig.kmk \
Index: /trunk/src/VBox/Installer/linux/rpm/rules
===================================================================
--- /trunk/src/VBox/Installer/linux/rpm/rules	(revision 73122)
+++ /trunk/src/VBox/Installer/linux/rpm/rules	(revision 73123)
@@ -138,4 +138,5 @@
 	     $(if $(NOSDL),--disable-vboxsdl,) \
 	     $(if $(filter el5 el6,$(rpmrel)),--build-libvpx,) \
+	     $(if $(filter el5 el6,$(rpmrel)),--build-libopus,) \
 	     $(if $(filter el5,$(rpmrel)),--build-libcurl,) \
 	     $(if $(filter el5,$(rpmrel)),--disable-sdl-ttf,) \