[Spice-devel] [PATCH spice-common v2 2/2] build: Disable celt 0.5.1 by default

[Frediano Ziglio]

From: Christophe Fergeau <cfergeau at redhat.com>

This version of the CELT codec has long been obsolete, and Opus support
has been added nearly 5 years ago. It's time we move on and try to stop
using Celt ;)

Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
---
 m4/spice-deps.m4  | 8 ++++----
 meson_options.txt | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4
index 3f6c056..91cdc86 100644
--- a/m4/spice-deps.m4
+++ b/m4/spice-deps.m4
@@ -107,7 +107,7 @@ AC_DEFUN([SPICE_CHECK_SMARTCARD], [
 
 # SPICE_CHECK_CELT051
 # -------------------
-# Adds a --disable-celt051 switch in order to enable/disable CELT 0.5.1
+# Adds a --enable-celt051 switch in order to enable/disable CELT 0.5.1
 # support, and checks if the needed libraries are available. If found, it will
 # return the flags to use in the CELT051_CFLAGS and CELT051_LIBS variables, and
 # it will define a HAVE_CELT051 preprocessor symbol as well as a HAVE_CELT051
@@ -115,10 +115,10 @@ AC_DEFUN([SPICE_CHECK_SMARTCARD], [
 #--------------------
 AC_DEFUN([SPICE_CHECK_CELT051], [
     AC_ARG_ENABLE([celt051],
-        [  --disable-celt051       Disable celt051 audio codec (enabled by default)],,
-        [enable_celt051="yes"])
+        [  --enable-celt051       Enable celt051 audio codec (disabled by default)],,
+        [enable_celt051="no"])
 
-    if test "x$enable_celt051" = "xyes"; then
+    if test "x$enable_celt051" != "xno"; then
         PKG_CHECK_MODULES([CELT051], [celt051 >= 0.5.1.1], [have_celt051=yes], [have_celt051=no])
     else
         have_celt051=no
diff --git a/meson_options.txt b/meson_options.txt
index 5189f4f..9f07bcc 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -12,8 +12,8 @@ option('extra-checks',
 
 option('celt051',
     type : 'boolean',
-    value : true,
-    description: 'Enable celt051 audio codec (default=true)')
+    value : false,
+    description: 'Enable celt051 audio codec (default=false)')
 
 option('python-checks',
     type : 'boolean',
-- 
2.17.1