diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2018-06-11 16:06:24 +0200 |
|---|---|---|
| committer | Victor Toso <me@victortoso.com> | 2018-06-11 17:26:36 +0200 |
| commit | 089553fffb2af890c5c6804dd8b9746daa3dec99 (patch) | |
| tree | 4f9cf3ea0d5ef5b9affda1d553e6ca65c40eec63 | |
| parent | e6e9d7acbb07e9f298498ec38a8f4fdec016b83b (diff) | |
build-sys: disable celt051 by default
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@redhat.com>
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | Makefile.am | 1 |
2 files changed, 3 insertions, 1 deletions
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 \ |