diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2018-06-05 11:26:57 +0200 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2018-06-05 14:09:55 +0100 |
| commit | 72b0d603e128cd3af15974fe6b3e4b56ea9c6f34 (patch) | |
| tree | f48c56a1cc964c8cf8c74c0e49f42c2e3cbf6277 /m4 | |
| parent | e98f8a430f7e2fd64dab74f9b9a85ee2dfa1b92f (diff) | |
build: Disable celt 0.5.1 by default
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 ;)
This commit disables CELT by default, but since this could be an
unexpected change for packagers, if CELT 0.5.1 development headers are
installed, it will error out unless --enable-celt051/--disable-celt051
has been explicitly specified.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/spice-deps.m4 | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4 index 3f6c056..7982b68 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,11 +115,24 @@ 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="auto"]) - 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]) + 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 else have_celt051=no fi |