From: Peter Korsgaard Date: Wed, 6 Jun 2012 21:12:17 +0000 (+0200) Subject: mediastreamer: fix configure error with ffmpeg and no libx11/libxv X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=86f649a00eadc090aa00fbc33c3b5dc41787b8ac;p=buildroot.git mediastreamer: fix configure error with ffmpeg and no libx11/libxv Fixes http://autobuild.buildroot.net/results/319f525d50eebbb84b2d2cb77294cc6f61246792 Signed-off-by: Peter Korsgaard --- diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk index a503490adb..65e4ec7595 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