From 51915a4bac77b7f827c8bdeb7bfdae677b845250 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 14 Nov 2011 15:44:10 +0100
Subject: [PATCH] fix srtp build

---
 .gitmodules                           |  3 +++
 submodules/build/builder-iphone-os.mk |  2 --
 submodules/build/builders.d/srtp.mk   | 27 ++++++++-------------------
 submodules/externals/srtp             |  1 +
 4 files changed, 12 insertions(+), 21 deletions(-)
 create mode 160000 submodules/externals/srtp

diff --git a/.gitmodules b/.gitmodules
index f064d4d5a..1e5c26cd3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -31,3 +31,6 @@
 [submodule "submodules/mssilk"]
 	path = submodules/mssilk
 	url = git://git.linphone.org/mssilk.git
+[submodule "submodules/externals/srtp"]
+	path = submodules/externals/srtp
+	url = git://git.linphone.org/srtp.git
diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk
index 0f120e320..c95fec29d 100644
--- a/submodules/build/builder-iphone-os.mk
+++ b/submodules/build/builder-iphone-os.mk
@@ -65,8 +65,6 @@ speex_dir?=externals/speex
 
 gsm_dir?=externals/gsm
 
-srtp_dir?=externals/srtp
-
 zrtpcpp_dir?=externals/zrtpcpp
 
 MSILBC_SRC_DIR:=$(BUILDER_SRC_DIR)/msilbc
diff --git a/submodules/build/builders.d/srtp.mk b/submodules/build/builders.d/srtp.mk
index 85e338231..e8b955078 100644
--- a/submodules/build/builders.d/srtp.mk
+++ b/submodules/build/builders.d/srtp.mk
@@ -1,17 +1,8 @@
-srtp_version?=1.4.4
-#srtp_url?=http://srtp.sourceforge.net/srtp-$(srtp_version).tgz
-srtp_url=http://sourceforge.net/projects/srtp/files/srtp/$(srtp_version)/srtp-$(srtp_version).tgz/download
-srtp_tgz_file=srtp-$(srtp_version).tgz
-
-$(BUILDER_SRC_DIR)/externals/$(srtp_tgz_file):
-	cd $(BUILDER_SRC_DIR)/externals \
-        && wget $(srtp_url) -O $(srtp_tgz_file) 
-
-$(BUILDER_SRC_DIR)/$(srtp_dir)/configure: $(BUILDER_SRC_DIR)/externals/$(srtp_tgz_file)
-	cd $(BUILDER_SRC_DIR)/externals \
-	&& tar zxvf $(srtp_tgz_file) \
-	&& cd srtp && patch -p0 < $(BUILDER_SRC_DIR)/build/builders.d/srtp.patch
+srtp_dir?=externals/srtp
 
+$(BUILDER_SRC_DIR)/$(srtp_dir)/configure: 
+	cd $(BUILDER_SRC_DIR)/$(srtp_dir) \
+	&& autoconf
 $(BUILDER_BUILD_DIR)/$(srtp_dir)/Makefile: $(BUILDER_SRC_DIR)/$(srtp_dir)/configure
 	mkdir -p $(BUILDER_BUILD_DIR)/$(srtp_dir)
 	cd $(BUILDER_BUILD_DIR)/$(srtp_dir)/\
@@ -19,17 +10,15 @@ $(BUILDER_BUILD_DIR)/$(srtp_dir)/Makefile: $(BUILDER_SRC_DIR)/$(srtp_dir)/config
 	$(BUILDER_SRC_DIR)/$(srtp_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode}
 
 build-srtp: $(BUILDER_BUILD_DIR)/$(srtp_dir)/Makefile
-	cp -rf $(BUILDER_SRC_DIR)/$(srtp_dir)/include $(BUILDER_BUILD_DIR)/$(srtp_dir)
-	cp -rf $(BUILDER_SRC_DIR)/$(srtp_dir)/crypto/include $(BUILDER_BUILD_DIR)/$(srtp_dir)
-	-cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make uninstall && make clean
-	cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make libsrtp.a && make install
+	cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make libsrtp.a && make uninstall install
 
 clean-srtp:
-	cd $(BUILDER_BUILD_DIR)/$(srtp_dir)  && make clean
+	-cd $(BUILDER_BUILD_DIR)/$(srtp_dir)  && make clean
 
 veryclean-srtp:
 	-cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make distclean
+	-rm -f $(BUILDER_SRC_DIR)/$(srtp_dir)/configure
 
 clean-makefile-srtp:
-	cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && rm -f Makefile
+	-cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && rm -f Makefile
 
diff --git a/submodules/externals/srtp b/submodules/externals/srtp
new file mode 160000
index 000000000..9d08cb329
--- /dev/null
+++ b/submodules/externals/srtp
@@ -0,0 +1 @@
+Subproject commit 9d08cb3299af0be8893d898a4cf3358ad26874b7