From bdc503644ef4cb8bf14d9396bc45cf4ec409f9ba Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 4 Sep 2013 11:29:20 +0200 Subject: [PATCH] Fix compilation with openssl. --- jni/Android.mk | 2 +- jni/Application.mk | 2 +- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jni/Android.mk b/jni/Android.mk index b6c734cbf..2ea7ad0d9 100755 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -69,7 +69,7 @@ include $(linphone-root-dir)/submodules/linphone/mediastreamer2/tools/Android.mk # Openssl -ifneq ($(BUILD_TUNNEL)$(BUILD_GPLV3_ZRTP), 00) +ifeq ($(BUILD_GPLV3_ZRTP), 1) ifeq (,$(DUMP_VAR)) $(info Openssl is required) endif diff --git a/jni/Application.mk b/jni/Application.mk index 3659d8c07..002eade0d 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -76,7 +76,7 @@ APP_MODULES += libtunnelclient endif ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) -ifeq ($(BUILD_TUNNEL), 1) +ifeq ($(BUILD_GPLV3_ZRTP), 1) APP_MODULES += liblincrypto liblinssl endif diff --git a/submodules/belle-sip b/submodules/belle-sip index e43c0000f..7faa117c9 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit e43c0000fc5b891eaf5685026cafdab18bffe89b +Subproject commit 7faa117c9264a659b3899d080d72bbcca8b73376 diff --git a/submodules/linphone b/submodules/linphone index 9a671657c..50469413f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9a671657c6edb30c188450ff257cb3dd88d839ee +Subproject commit 50469413f014b67c8bc0c667070d7d0a5b8fd98d