projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: edd2716)
mediastreamer: fix configure error with ffmpeg and no libx11/libxv
authorPeter Korsgaard <jacmet@sunsite.dk>
Wed, 6 Jun 2012 21:12:17 +0000 (23:12 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Wed, 6 Jun 2012 21:12:17 +0000 (23:12 +0200)
Fixes http://autobuild.buildroot.net/results/319f525d50eebbb84b2d2cb77294cc6f61246792

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/mediastreamer/mediastreamer.mk patch | blob | history

diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
index a503490adb1aa45c6e6d0bb0b34056eae8e41187..65e4ec7595c463012297a49392f8c4ee8ce20bf2 100644 (file)
--- 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