Hi, Fine with me. On 6/12/19 3:06 PM, Frediano Ziglio wrote:
We started disabling Celt support making the option required. After 2 releases start making it disabled unless explicitly enabled. Signed-off-by: Frediano Ziglio <fziglio@xxxxxxxxxx> --- m4/spice-deps.m4 | 14 ++------------ meson_options.txt | 1 + 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4 index 02230dd..1214341 100644 --- a/m4/spice-deps.m4 +++ b/m4/spice-deps.m4 @@ -101,21 +101,11 @@ AC_DEFUN([SPICE_CHECK_SMARTCARD], [ AC_DEFUN([SPICE_CHECK_CELT051], [ AC_ARG_ENABLE([celt051], AS_HELP_STRING([--enable-celt051], - [Enable celt051 audio codec @<:@default=auto@:>@]),, - [enable_celt051="auto"]) + [Enable celt051 audio codec @<:@default=no@:>@]),, + [enable_celt051="no"])if test "x$enable_celt051" != "xno"; thenPKG_CHECK_MODULES([CELT051], [celt051 >= 0.5.1.1], [have_celt051=yes], [have_celt051=no]) - if test "x$enable_celt051" = "xauto"; then - if test "x$have_celt051" = "xyes"; then - AC_MSG_ERROR(m4_normalize([ - CELT 0.5.1.x has been detected, \ - but CELT support is no longer automatically enabled by default. \ - Please explicitly use --enable-celt051 or --disable-celt051 - ])) - fi - # have_celt051 is "no" here, so celt is disabled by default - fi if test "x$enable_celt051" = "xyes" && test "x$have_celt051" != "xyes"; then AC_MSG_ERROR(["--enable-celt051 has been specified, but CELT 0.5.1 is missing"]) fi diff --git a/meson_options.txt b/meson_options.txt index 7e9e704..c982736 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -12,6 +12,7 @@ option('extra-checks',option('celt051',type : 'feature', + value : 'disabled', yield : true, description: 'Enable celt051 audio codec')
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel