[Spice-commits] configure.ac

[GitLab Mirror]

 configure.ac |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 4b940123fcd5688cebbc2267d00573b493231a97
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Jun 20 10:54:31 2018 +0200

    build: Use SPICE_CHECK_CELT051 in configure.ac
    
    spice-common provides a m4 macro to check for celt, but spice-server is
    not using it. With the recent disabling of celt in spice-common, the
    default in spice-server got out of sync. It's better to use the same check
    everywhere, even though in spice-server its only use is to show
    --enable-celt051 in --help output.
    
    Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/configure.ac b/configure.ac
index 6cbd6a99..56485938 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,15 +181,7 @@ AC_SUBST(PIXMAN_CFLAGS)
 AC_SUBST(PIXMAN_LIBS)
 AS_VAR_APPEND([SPICE_REQUIRES], [" pixman-1 >= $PIXMAN_REQUIRED"])
 
-AC_ARG_ENABLE([celt051],
-              AS_HELP_STRING([--disable-celt051], [Disable celt051 audio codec (enabled by default)]),,
-              [enable_celt051="yes"])
-
-if test "x$enable_celt051" = "xyes"; then
-    CELT051_REQUIRED=0.5.1.1
-    PKG_CHECK_MODULES(CELT051, celt051 >= $CELT051_REQUIRED,
-                      AS_VAR_APPEND([SPICE_REQUIRES], [" celt051 >= $CELT051_REQUIRED"]))
-fi
+SPICE_CHECK_CELT051
 
 PKG_CHECK_MODULES(SSL, openssl >= 1.0.0)
 AC_SUBST(SSL_CFLAGS)