[vlc-commits] contrib: speex: avoid automatically depending on ogg

[Tristan Matthews]

vlc/vlc-2.2 | branch: master | Tristan Matthews <tmatth at videolan.org> | Mon Oct  6 23:08:02 2014 -0400| [ea1927e79317b60a931c7bfff246914aac9d6a7a] | committer: Tristan Matthews

contrib: speex: avoid automatically depending on ogg

ogg was still being pulled in as a dependency when cross-compiling, which
would break certain build configurations.

(cherry picked from commit 4c63aa1192dc4148b8c540b0b7210aa91713505b)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=ea1927e79317b60a931c7bfff246914aac9d6a7a
---

 contrib/src/speex/rules.mak |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak
index 7d7cce9..f9ff8d9 100644
--- a/contrib/src/speex/rules.mak
+++ b/contrib/src/speex/rules.mak
@@ -27,7 +27,7 @@ speex: speex-$(SPEEX_VERSION).tar.gz .sum-speex
 	$(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
 	$(MOVE)
 
-SPEEX_CONF := --without-ogg
+SPEEX_CONF := --disable-binaries
 ifndef HAVE_FPU
 SPEEX_CONF += --enable-fixed-point
 ifeq ($(ARCH),arm)