From bbdd908e4afaaa3e0a644f7634a4c8524402f272 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Thu, 1 Sep 2011 11:16:38 +0200 Subject: [PATCH] Don't compile ZRTPCPP when zrtp is disabled. --- submodules/build/builders.d/zrtp.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/submodules/build/builders.d/zrtp.mk b/submodules/build/builders.d/zrtp.mk index 68912425b..49088d1a4 100644 --- a/submodules/build/builders.d/zrtp.mk +++ b/submodules/build/builders.d/zrtp.mk @@ -8,10 +8,17 @@ $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile: && cmake $(BUILDER_SRC_DIR)/$(zrtpcpp_dir) -Denable-ccrtp=false $(TC) -LH -Wdev -DCMAKE_INSTALL_PREFIX=$(prefix) -DCMAKE_FIND_ROOT_PATH="$(prefix)" # Used toolchain: $(TC) +ifeq ($(enable_zrtp),yes) + build-zrtpcpp: $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile build-openssl echo "Build ZRTP - prefix $(prefix)" cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) && make && make install +else +build-zrtpcpp: + echo "Build of zrtpcpp disabled" +endif + clean-zrtpcpp: -cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) && make clean @@ -20,3 +27,5 @@ clean-makefile-zrtpcpp: clean-zrtpcpp -rm -f $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/CMakeCache.txt + +