From 1f7110f5618ef3a4a15f549ab00d5f2c564daa46 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Mon, 2 Sep 2013 11:52:46 +0200
Subject: [PATCH] Autodetect need for openssl.

---
 jni/Android.mk | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 068467e6c..b6c734cbf 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -68,15 +68,16 @@ include $(linphone-root-dir)/submodules/linphone/mediastreamer2/build/android/An
 include $(linphone-root-dir)/submodules/linphone/mediastreamer2/tools/Android.mk
 
 
-ifeq ($(BUILD_TUNNEL), 1)
 # Openssl
-ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/ssl.mk),)
-include $(linphone-root-dir)/submodules/externals/openssl/Android.mk
-else
-include $(linphone-root-dir)/submodules/externals/prebuilts/ssl.mk
-include $(linphone-root-dir)/submodules/externals/prebuilts/crypto.mk
+ifneq ($(BUILD_TUNNEL)$(BUILD_GPLV3_ZRTP), 00)
+ifeq (,$(DUMP_VAR))
+$(info Openssl is required)
 endif
+include $(linphone-root-dir)/submodules/externals/openssl/Android.mk
+endif
+
 #tunnel
+ifeq ($(BUILD_TUNNEL), 1)
 include $(linphone-root-dir)/submodules/tunnel/Android.mk
 endif