From 2eddb8ad815548f9a40610983ee2f0aa989627c7 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 23 Apr 2014 09:36:55 +0200
Subject: [PATCH] merge tunnel branch into main branch so that source code is
 exactly the same in the two branches. The only difference is the presence of
 the submodules/tunnel .

---
 .gitmodules                           |   3 ---
 Classes/SettingsViewController.m      |   4 ++++
 submodules/binaries/libdummy.a        | Bin 0 -> 7684 bytes
 submodules/binaries/why.txt           |   1 +
 submodules/build/Makefile             |   3 ++-
 submodules/build/builder-iphone-os.mk |   3 +++
 submodules/tunnel                     |   1 -
 7 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 submodules/binaries/libdummy.a
 delete mode 160000 submodules/tunnel

diff --git a/.gitmodules b/.gitmodules
index 2a56364cc..9db29456b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,9 +40,6 @@
 [submodule "submodules/externals/srtp"]
 	path = submodules/externals/srtp
 	url = git://git.linphone.org/srtp.git
-[submodule "submodules/tunnel"]
-	path = submodules/tunnel
-	url = gitosis@git.linphone.org:tunnel
 [submodule "submodules/bcg729"]
 	path = submodules/bcg729
 	url = git://git.linphone.org/bcg729.git
diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m
index add23bf2a..e7ace1b6d 100644
--- a/Classes/SettingsViewController.m
+++ b/Classes/SettingsViewController.m
@@ -687,6 +687,10 @@ static UICompositeViewDescription *compositeDescription = nil;
 		[hiddenKeys addObject:@"wizard_button"];
 	}
 	
+	if (!linphone_core_tunnel_available()){
+		[hiddenKeys addObject:@"tunnel_menu"];
+	}
+	
     return hiddenKeys;
 }
 
diff --git a/submodules/binaries/libdummy.a b/submodules/binaries/libdummy.a
new file mode 100644
index 0000000000000000000000000000000000000000..a4910d080da86dbecac03dec5e130d83142cc4ac
GIT binary patch
literal 7684
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
AVE_OC

literal 0
HcmV?d00001

diff --git a/submodules/binaries/why.txt b/submodules/binaries/why.txt
index 0c656228c..5325fecad 100644
--- a/submodules/binaries/why.txt
+++ b/submodules/binaries/why.txt
@@ -5,6 +5,7 @@ This directory is here because some of our dependencies compile incorrecly
 
 You'll find here the reasons why certain libs are furnished pre-compiled.
 
+Additionaly, the libdummy.a is an empty library created to stub the tunnel extension.
 
 = Libvpx =
 
diff --git a/submodules/build/Makefile b/submodules/build/Makefile
index c717c51ca..e6b95ed13 100644
--- a/submodules/build/Makefile
+++ b/submodules/build/Makefile
@@ -19,7 +19,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ############################################################################
-enable_gpl_third_parties=no
+enable_gpl_third_parties=yes
 enable_zrtp=yes
 enable_ffmpeg=yes
 enable_opus=yes
@@ -30,6 +30,7 @@ TUNNEL_AVAILABLE=$(shell ls ../tunnel/configure.ac)
 
 ifneq ($(TUNNEL_AVAILABLE),)
 enable_tunnel=yes
+enable_gpl_third_parties=no
 endif
 
 
diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk
index d568ba58f..e2351179b 100644
--- a/submodules/build/builder-iphone-os.mk
+++ b/submodules/build/builder-iphone-os.mk
@@ -313,6 +313,9 @@ multi-arch:
                 	echo "WARNING: archive `basename $$archive` exists in arm tree but does not exists in i386 tree."; \
         	fi \
 	done
+	if ! test -f $(prefix)../apple-darwin/lib/libtunnel.a ; then \
+		cp -f $(BUILDER_SRC_DIR)/../submodules/binaries/libdummy.a $(prefix)/../apple-darwin/lib/libtunnel.a ; \
+	fi
 
 
 delivery-sdk: multi-arch
diff --git a/submodules/tunnel b/submodules/tunnel
deleted file mode 160000
index 6cae0398a..000000000
--- a/submodules/tunnel
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6cae0398a9efb9451e79076479b082edac9335cc