From 262aa2c2e540c803196d53779fb72226a8efeb5f Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Thu, 17 Apr 2014 22:09:44 +0300
Subject: More generic way to disable avmedia

Introduce a configure option --disable-avmedia. For non-desktop,
avmedia is always disabled (for now), and for desktop enabled by
default. Add AVMEDIA to BUILD_TYPE when enabled. Don't build avmedia
when disabled. Add HAVE_FEATURE_AVMEDIA to <config_features.h>. Bypass
avmedia-related code when disabled.

Change-Id: I919c6e199bff87d9f142d55dff6373f0ed217f39
---
 cui/Library_cui.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cui')

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 28f4b64290c0..1ac0ed757ea0 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Library_use_custom_headers,cui,\
 $(eval $(call gb_Library_use_sdk_api,cui))
 
 $(eval $(call gb_Library_use_libraries,cui,\
-    avmedia \
+	$(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
     comphelper \
     cppu \
-- 
cgit