Merge remote-tracking branch 'linphone/master'

.gitignore

@@ -73,3 +73,8 @@ tools/xml2lpc_test
 coreapi/help/filetransfer
 tester/receive_file.dump
 tester/tmp.db
+.DS_Store
+Linphone.app
+*.dmg
+tester/linphone*.log
+tester/linphone_log.txt

CMakeLists.txt

@@ -20,7 +20,7 @@
 #
 ############################################################################
 
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 project(LINPHONE C CXX)
 
 
@@ -61,6 +61,13 @@ endif()
 find_package(BelleSIP REQUIRED)
 find_package(MS2 REQUIRED)
 find_package(XML2 REQUIRED)
+if(ENABLE_TUNNEL)
+	find_package(Tunnel)
+	if(NOT TUNNEL_FOUND)
+		message(WARNING "Could not find the tunnel library!")
+		set(ENABLE_TUNNEL OFF CACHE BOOL "Enable tunnel support" FORCE)
+	endif()
+endif()
 
 
 include_directories(
@@ -72,6 +79,9 @@ include_directories(
 	${MS2_INCLUDE_DIRS}
 	${XML2_INCLUDE_DIRS}
 )
+if(ENABLE_TUNNEL)
+	include_directories(${TUNNEL_INCLUDE_DIRS})
+endif()
 
 if(MSVC)
 	include_directories(${CMAKE_PREFIX_PATH}/include/MSVC)
@@ -94,6 +104,9 @@ add_definitions(-DHAVE_CONFIG_H)
 
 add_subdirectory(coreapi)
 add_subdirectory(share)
+if(ENABLE_TOOLS)
+	add_subdirectory(tools)
+endif()
 
 
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/FindLinphone.cmake

FindLinphone.cmake

@@ -26,6 +26,7 @@
 #  LINPHONE_INCLUDE_DIRS - the linphone include directory
 #  LINPHONE_LIBRARIES - The libraries needed to use linphone
 #  LINPHONE_CPPFLAGS - The compilation flags needed to use linphone
+#  LINPHONE_LDFLAGS - The linking flags needed to use linphone
 
 find_package(ORTP REQUIRED)
 find_package(MS2 REQUIRED)
@@ -55,15 +56,19 @@ find_library(LINPHONE_LIBRARIES
 
 list(APPEND LINPHONE_INCLUDE_DIRS ${ORTP_INCLUDE_DIRS} ${MS2_INCLUDE_DIRS} ${XML2_INCLUDE_DIRS} ${BELLESIP_INCLUDE_DIRS})
 list(APPEND LINPHONE_LIBRARIES ${ORTP_LIBRARIES} ${MS2_LIBRARIES} ${XML2_LIBRARIES} ${BELLESIP_LIBRARIES})
+if(WIN32)
+	list(APPEND LINPHONE_LIBRARIES shlwapi)
+endif(WIN32)
 
 list(REMOVE_DUPLICATES LINPHONE_INCLUDE_DIRS)
 list(REMOVE_DUPLICATES LINPHONE_LIBRARIES)
-set(LINPHONE_CPPFLAGS ${MS2_CPPFLAGS})
+set(LINPHONE_CPPFLAGS "${MS2_CPPFLAGS}")
+set(LINPHONE_LDFLAGS "${MS2_LDFLAGS} ${BELLESIP_LDFLAGS}")
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Linphone
 	DEFAULT_MSG
-	LINPHONE_INCLUDE_DIRS LINPHONE_LIBRARIES LINPHONE_CPPFLAGS
+	LINPHONE_INCLUDE_DIRS LINPHONE_LIBRARIES
 )
 
-mark_as_advanced(LINPHONE_INCLUDE_DIRS LINPHONE_LIBRARIES LINPHONE_CPPFLAGS)
+mark_as_advanced(LINPHONE_INCLUDE_DIRS LINPHONE_LIBRARIES LINPHONE_CPPFLAGS LINPHONE_LDFLAGS)

Makefile.am

@@ -51,7 +51,7 @@ PACKAGE_BUNDLE_FILE=$(top_srcdir)/build/macos/$(PACKAGE).bundle
 EXTRA_DIST =		BUGS  \
 			README.arm \
 			README.mingw \
-			README.macos \
+			README.macos.md \
 			autogen.sh \
 			linphone.spec \
 			linphone.spec.in \
@@ -172,7 +172,7 @@ filelist: zip
 setup.exe: filelist
 	cp $(ISS_SCRIPT) $(INSTALLDIR_WITH_PREFIX)/.
 	cd $(INSTALLDIR_WITH_PREFIX) && \
-	$(ISCC) $(ISS_SCRIPT) 
+	$(ISCC) $(ISS_SCRIPT)
 	mv $(INSTALLDIR_WITH_PREFIX)/Output/setup.exe $(PACKAGE)-$(VERSION)-setup.exe
 	rm -rf $(INSTALLDIR_WITH_PREFIX)/Output
 	rm -f $(INSTALLDIR_WITH_PREFIX)/$(PACKAGE_WIN32_FILELIST)

README

@@ -11,12 +11,12 @@ This is Linphone, a free (GPL) video softphone based on the SIP protocol.
  	- belle-sip>=1.3.0
 	- speex>=1.2.0 (including libspeexdsp part)
 	- libxml2
-	
+
 	+ if you want the gtk/glade interface:
 		- libgtk >=2.16.0
 	+ if you want video support:
 		- libvpx (VP8 codec)
-		- libavcodec (ffmpeg) 
+		- libavcodec (ffmpeg)
 		- libswscale (part of ffmpeg too) for better scaling performance
 		- libxv (x11 video extension)
 		- libgl1-mesa (OpenGL API -- GLX development files)
@@ -31,31 +31,31 @@ This is Linphone, a free (GPL) video softphone based on the SIP protocol.
 	+ if you want uPnP support (optional):
 		- libupnp (version 1.6 branch (not patched with 18-url-upnpstrings.patch))
 
-	Here is the command line to get these dependencies installed for Ubuntu && Debian 
+	Here is the command line to get these dependencies installed for Ubuntu && Debian
 
-	$ sudo apt-get install libtool intltool libgtk2.0-dev libspeexdsp-dev libavcodec-dev libswscale-dev libx11-dev libxv-dev libgl1-mesa-dev libglew1.6-dev libv4l-dev libxml2-dev
+	$ sudo apt-get install libtool intltool libgtk2.0-dev libspeexdsp-dev \
+libavcodec-dev libswscale-dev libx11-dev libxv-dev libgl1-mesa-dev \
+libglew1.6-dev libv4l-dev libxml2-dev
 
 	+ for optional library
-	$ sudo apt-get install libreadline-dev libgsm1-dev libtheora-dev libsoup2.4-dev libsqlite3-dev libupnp4-dev
+	$ sudo apt-get install libreadline-dev libgsm1-dev libtheora-dev \
+libsoup2.4-dev libsqlite3-dev libupnp4-dev
 
 	+ Install srtp (optional) for call encryption :
 		$ git clone git://git.linphone.org/srtp.git
- 		$ cd srtp && autoconf && ./configure && make
- 		$ sudo make install
+		$ cd srtp && autoconf && ./configure && make
+		$ sudo make install
 
-	+ Install zrtpcpp (optional), for unbreakable call encryption
- 		$ sudo apt-get install cmake
-		$ git clone https://github.com/wernerd/ZRTPCPP.git
-		$ cd ZRTPCPP 
-		$ cmake -DCORE_LIB=true -DSDES=false . && make
- 		$ sudo make install
-		If you get this error: "cc1plus: error: unrecognized command line option ‘-std=c++11’", edit CMakeLists.txt and replace c++11 by c++0x .
+	+ Install zrtp (optional), for unbreakable call encryption
+		$ git clone git://git.linphone.org:bzrtp
+		$ cd bzrtp && ./autogen.sh && ./configure && make
+		$ sudo make install
 
 - Compile linphone
 
  $ ./autogen.sh
- $ ./configure 
- $ make && sudo make install 
+ $ ./configure
+ $ make && sudo make install
  $ sudo ldconfig
 
 
@@ -68,10 +68,10 @@ For macOS X, see README.macos
 
 Here is a short description of the content of the source tree.
 
-- oRTP/ is a poweful implementation of the RTP protocol. See the oRTP/README for more details. 
+- oRTP/ is a poweful implementation of the RTP protocol. See the oRTP/README for more details.
 	It is used by the mediastreamer to send and receive streams to the network.
 
-- mediastreamer2/ is one of the important part of linphone. It is a framework library for audio 
+- mediastreamer2/ is one of the important part of linphone. It is a framework library for audio
 	and video processing. It contains several objects for grabing audio and video and outputing
 	it (through rtp, to file).
 	It contains also codec objects to compress audio and video streams.
@@ -86,6 +86,6 @@ Here is a short description of the content of the source tree.
 	* linphonec.c is the main file for the console version of linphone.
 	* sipomatic.c / sipomatic.h contains the code for sipomatic, the test program that auto-answer to linphone calls.
 	* shell.c (program name: linphonecsh) is a small utilities to send interactive commands to a running linphonec daemon.
-		
+
 - share/ contains translation, documentation, rings and hello sound files.