summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2012-06-06 21:12:17 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-06-06 21:12:17 (GMT)
commit86f649a00eadc090aa00fbc33c3b5dc41787b8ac (patch)
tree964c4253191359f861e7435ecacf8aad90649e69
parentedd2716c4369801770c10fad5565ab0d3e117c3f (diff)
downloadbuildroot-86f649a00eadc090aa00fbc33c3b5dc41787b8ac.tar.gz
buildroot-86f649a00eadc090aa00fbc33c3b5dc41787b8ac.tar.bz2
mediastreamer: fix configure error with ffmpeg and no libx11/libxv
Fixes http://autobuild.buildroot.net/results/319f525d50eebbb84b2d2cb77294cc6f61246792 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/mediastreamer/mediastreamer.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
index a503490..65e4ec7 100644
--- a/package/mediastreamer/mediastreamer.mk
+++ b/package/mediastreamer/mediastreamer.mk
@@ -50,6 +50,9 @@ endif
ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
MEDIASTREAMER_CONF_OPT += --enable-x11
MEDIASTREAMER_DEPENDENCIES += xlib_libX11
+else
+MEDIASTREAMER_CONF_OPT += --disable-x11
+endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y)
MEDIASTREAMER_CONF_OPT += --enable-xv
@@ -58,10 +61,6 @@ else
MEDIASTREAMER_CONF_OPT += --disable-xv
endif
-else
-MEDIASTREAMER_CONF_OPT += --disable-x11
-endif
-
ifeq ($(BR2_PACKAGE_LIBTHEORA),y)
MEDIASTREAMER_CONF_OPT += --enable-theora
MEDIASTREAMER_DEPENDENCIES += libtheora