From b60ca6b5f7d29e7aa41cef13b99544d7e326e52e Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Mon, 21 Oct 2013 16:10:20 +0200 Subject: [PATCH] Don't cancel non-GPL build when FFMPEG is activated. Instead, disable it. --- submodules/build/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/submodules/build/Makefile b/submodules/build/Makefile index 2773dbd8a..5b0edbc11 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -35,7 +35,8 @@ ifeq ($(enable_gpl_third_parties)$(enable_zrtp),noyes) endif ifeq ($(enable_gpl_third_parties)$(enable_ffmpeg),noyes) - CHECKOPT_MSG += "FFMPEG is not available in non-gpl build.\n" +# ffmpeg is not compatible with no GPL. + enable_ffmpeg:=no endif ifneq ($(CHECKOPT_MSG),"")