diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-17 22:09:44 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-17 22:18:02 +0300 |
| commit | 262aa2c2e540c803196d53779fb72226a8efeb5f (patch) | |
| tree | 6e27c452faa73094b0590f493945b55ab3483f18 /postprocess | |
| parent | f5ccbfdc561c68099872d1abe07ac72fcddedd35 (diff) | |
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
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/Rdb_services.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index cffd75b8cc6e..3e9424c8c26f 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Rdb_Rdb_install,services)) $(eval $(call gb_Rdb_add_components,services,\ animations/source/animcore/animcore \ - avmedia/util/avmedia \ + $(call gb_Helper_optional,AVMEDIA,avmedia/util/avmedia) \ chart2/source/controller/chartcontroller \ chart2/source/chartcore \ canvas/source/factory/canvasfactory \ @@ -122,7 +122,7 @@ $(eval $(call gb_Rdb_add_components,services,\ $(if $(filter MACOSX,$(OS)), \ $(if $(filter-out X86_64,$(CPUNAME)), \ $(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \ - avmedia/source/quicktime/avmediaQuickTime \ + $(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \ ) \ ) \ lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \ |