Changeset 73369 in vbox for trunk/configure

Timestamp:

Jul 26, 2018 11:24:47 AM (6 years ago)

Author:

vboxsync

Message:

configure: Handle libopus on solaris/darwin like libvpx, i.e. pretend it doesn't exist and disabling the feature. Should be replaced by proper detection.

File:

• trunk/configure (modified) (8 diffs)

trunk/configure

@@ -100 +100 @@
 WITH_DOCS=1
 WITH_LIBVPX=1
+WITH_LIBOPUS=1
 BUILD_LIBXML2=
 BUILD_LIBCURL=
@@ -2325 +2326 @@
 [ $WITH_DOCS    -eq 1 ] && echo "  --disable-docs           don't build the documentation"
 [ $WITH_LIBVPX  -eq 1 ] && echo "  --disable-libvpx         don't use libvpx for video capturing"
+[ $WITH_LIBOPUS -eq 1 ] && echo "  --disable-libopus        don't use libopus for audio capturing"
 [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo "  --enable-vde             enable VDE networking"
 cat << EOF
@@ -2396 +2398 @@
   [ $OSE -eq 1 ] || BUILD_LIBCURL=1
   [ $OSE -eq 1 ] && WITH_LIBVPX=0
+  [ $OSE -eq 1 ] && WITH_LIBOPUS=0
   WITH_XCODE_DIR=""
 elif [ "$OS" = "haiku" ]; then
@@ -2410 +2413 @@
   BUILD_LIBXML2=1
   WITH_LIBVPX=0
+  WITH_LIBOPUS=0
   # it is part of libroot, which is linked by default,
   # but the script wants something
@@ -2417 +2421 @@
 elif [ "$OS" = "solaris" ]; then
   [ $OSE -eq 1 ] && WITH_LIBVPX=0
+  [ $OSE -eq 1 ] && WITH_LIBOPUS=0
 fi
 
@@ -2558 +2563 @@
     --disable-libvpx)
       WITH_LIBVPX=0
+      ;;
+    --disable-libopus)
+      WITH_LIBOPUS=0
       ;;
     --disable-sdl)
@@ -2748 +2756 @@
   cnf_append "VBOX_WITH_VIDEOREC" ""
 fi
+if [ $WITH_LIBOPUS -eq 0 ]; then
+  cnf_append "VBOX_WITH_LIBOPUS" ""
+  cnf_append "VBOX_WITH_AUDIO_VIDEOREC" ""
+fi
 
 # Darwin-specific
@@ -2771 +2783 @@
   check_curl
   [ $WITH_LIBVPX -eq 1 ] && check_vpx
-  check_libopus
- [ "$OS" != "darwin"  ] && check_z
+  [ $WITH_LIBOPUS -eq 1 ] && check_libopus
+  [ "$OS" != "darwin"  ] && check_z
   [ "$OS" != "darwin"  ] && check_png
   [ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam