[Spice-devel] [spice-gtk 2/3] build-sys: disable celt051 by default

Victor Toso victortoso at redhat.com
Mon Jun 11 15:28:50 UTC 2018


From: Christophe Fergeau <cfergeau at redhat.com>

With spice-common commit 72b0d603e12, SPICE_CHECK_CELT051 will error
out if celt051-devel is installed, but neither --enable-celt051 nor
--disable-celt051 are specified. This could be a problem when running
make distcheck, so this commit adds --disable-celt051 so that we never
hit that error.

Signed-off-by: Victor Toso <victortoso at redhat.com>
---
 .gitlab-ci.yml | 3 ++-
 Makefile.am    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a34eb0e..e2c35ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ before_script:
 
 makecheck:
   script:
-  - ./autogen.sh --enable-static
+  - ./autogen.sh --enable-static --disable-celt051
   - make -j4
   - make check
 
@@ -27,5 +27,6 @@ makecheck_simple:
         --enable-smartcard=no
         --enable-usbredir=no
         --enable-dbus=no
+        --disable-celt051
   - make -j4
   - make check
diff --git a/Makefile.am b/Makefile.am
index 8717cbc..8c000fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,6 +59,7 @@ $(top_srcdir)/.version:
 
 DISTCHECK_CONFIGURE_FLAGS =			\
 	--enable-introspection			\
+	--disable-celt051			\
 	--disable-vala				\
 	--disable-usbredir			\
 	--enable-gtk-doc			\
-- 
2.17.1



More information about the Spice-devel mailing list