Use CMake to build srtp.

builders/srtp.cmake

@@ -20,4 +20,4 @@
 #
 ############################################################################
 
-linphone_builder_add_autotools_project(srtp)
+linphone_builder_add_cmake_project(srtp)

builders/srtp/build.sh.cmake

-#!/bin/sh
-
-export CC=@LINPHONE_BUILDER_TOOLCHAIN_CC@
-export CXX=@LINPHONE_BUILDER_TOOLCHAIN_CXX@
-export LD=@LINPHONE_BUILDER_TOOLCHAIN_LD@
-export AR=@LINPHONE_BUILDER_TOOLCHAIN_AR@
-export RANLIB=@LINPHONE_BUILDER_TOOLCHAIN_RANLIB@
-export STRIP=@LINPHONE_BUILDER_TOOLCHAIN_STRIP@
-export NM=@LINPHONE_BUILDER_TOOLCHAIN_NM@
-
-export CPPFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_CPPFLAGS@ @EP_srtp_EXTRA_CPPFLAGS@"
-export CFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_CFLAGS@ @EP_srtp_EXTRA_CFLAGS@"
-export CXXFLAGS="@LINPHONE_BUILD_TOOLCHAIN_CXXFLAGS@ @EP_srtp_EXTRA_CXXFLAGS@"
-export LDFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_LDFLAGS@ @EP_srtp_EXTRA_LDFLAGS@"
-
-export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
-
-make V=@CMAKE_VERBOSE_MAKEFILE@

builders/srtp/configure.sh.cmake

-#!/bin/sh
-
-export CC=@LINPHONE_BUILDER_TOOLCHAIN_CC@
-export CXX=@LINPHONE_BUILDER_TOOLCHAIN_CXX@
-export LD=@LINPHONE_BUILDER_TOOLCHAIN_LD@
-export AR=@LINPHONE_BUILDER_TOOLCHAIN_AR@
-export RANLIB=@LINPHONE_BUILDER_TOOLCHAIN_RANLIB@
-export STRIP=@LINPHONE_BUILDER_TOOLCHAIN_STRIP@
-export NM=@LINPHONE_BUILDER_TOOLCHAIN_NM@
-
-export CPPFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_CPPFLAGS@ @EP_srtp_EXTRA_CPPFLAGS@"
-export CFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_CFLAGS@ @EP_srtp_EXTRA_CFLAGS@"
-export CXXFLAGS="@LINPHONE_BUILD_TOOLCHAIN_CXXFLAGS@ @EP_srtp_EXTRA_CXXFLAGS@"
-export LDFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_LDFLAGS@ @EP_srtp_EXTRA_LDFLAGS@"
-
-export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
-
-if [ ! -f config.h ]; then
-	./autogen.sh
-	./configure "--prefix=@CMAKE_INSTALL_PREFIX@" "--host=@LINPHONE_BUILDER_TOOLCHAIN_HOST@" @EP_srtp_CONFIGURE_OPTIONS@
-fi

builders/srtp/install.sh.cmake

-#!/bin/sh
-
-export CC=@LINPHONE_BUILDER_TOOLCHAIN_CC@
-export CXX=@LINPHONE_BUILDER_TOOLCHAIN_CXX@
-export LD=@LINPHONE_BUILDER_TOOLCHAIN_LD@
-export AR=@LINPHONE_BUILDER_TOOLCHAIN_AR@
-export RANLIB=@LINPHONE_BUILDER_TOOLCHAIN_RANLIB@
-export STRIP=@LINPHONE_BUILDER_TOOLCHAIN_STRIP@
-export NM=@LINPHONE_BUILDER_TOOLCHAIN_NM@
-
-export CPPFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_CPPFLAGS@ @EP_srtp_EXTRA_CPPFLAGS@"
-export CFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_CFLAGS@ @EP_srtp_EXTRA_CFLAGS@"
-export CXXFLAGS="@LINPHONE_BUILD_TOOLCHAIN_CXXFLAGS@ @EP_srtp_EXTRA_CXXFLAGS@"
-export LDFLAGS="@LINPHONE_BUILDER_TOOLCHAIN_LDFLAGS@ @EP_srtp_EXTRA_LDFLAGS@"
-
-export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
-
-make V=@CMAKE_VERBOSE_MAKEFILE@ install

configs/config-bb10.cmake

@@ -40,7 +40,7 @@ set(EP_bellesip_CONFIGURE_OPTIONS "${AUTOTOOLS_SHARED_LIBRARIES} ${EP_bellesip_C
 set(EP_bellesip_EXTRA_CFLAGS "-Wno-error=pragmas -DUSE_STRUCT_RES_STATE_NAMESERVERS")
 
 # srtp
-set(EP_srtp_CONFIGURE_OPTIONS "--enable-shared ${EP_srtp_CONFIGURE_OPTIONS}")
+set(EP_srtp_CMAKE_OPTIONS "${CMAKE_SHARED_LIBRARIES} ${EP_srtp_CMAKE_OPTIONS}")
 
 # speex
 set(EP_speex_CMAKE_OPTIONS "${CMAKE_SHARED_LIBRARIES} ${EP_speex_CMAKE_OPTIONS}")

configs/config-default.cmake

@@ -61,7 +61,6 @@ set(EP_bellesip_DEPENDENCIES EP_antlr3c EP_cunit EP_polarssl)
 # srtp
 set(EP_srtp_GIT_REPOSITORY "git://git.linphone.org/srtp.git")
 set(EP_srtp_GIT_TAG "master")
-set(EP_srtp_CONFIGURE_OPTIONS "--enable-pic")
 
 # gsm
 set(EP_gsm_GIT_REPOSITORY "git://git.linphone.org/gsm.git")

configs/config-desktop.cmake

@@ -39,7 +39,7 @@ set(EP_polarssl_CMAKE_OPTIONS "-DUSE_SHARED_POLARSSL_LIBRARY=1")
 set(EP_bellesip_CONFIGURE_OPTIONS "${AUTOTOOLS_SHARED_LIBRARIES} ${EP_bellesip_CONFIGURE_OPTIONS}")
 
 # srtp
-set(EP_srtp_CONFIGURE_OPTIONS "--enable-shared ${EP_srtp_CONFIGURE_OPTIONS}")
+set(EP_srtp_CMAKE_OPTIONS "${CMAKE_SHARED_LIBRARIES} ${EP_srtp_CMAKE_OPTIONS}")
 
 # speex
 set(EP_speex_CMAKE_OPTIONS "${CMAKE_SHARED_LIBRARIES} ${EP_speex_CMAKE_OPTIONS}")