--- qutecom/cmake/Modules/FindMEDIASTREAMER2.cmake	1970-01-01 03:00:00.000000000 +0300
+++ qutecom/cmake/Modules/FindMEDIASTREAMER2.cmake	2011-09-14 14:35:45.599868896 +0300
@@ -0,0 +1,30 @@
+SET(mediastreamer2_FOUND 0)
+
+SET(mediastreamer2_INCLUDE_SEARCHPATH)
+SET(mediastreamer2_LIBRARY_NAME mediastreamer2)
+
+SET(mediastreamer2_LIBRARY_DIR CACHE PATH "Semi-colon separated list of paths to search for an external mediastreamer2 library")
+MARK_AS_ADVANCED(mediastreamer2_LIBRARY_DIR)
+
+FIND_PATH(mediastreamer2_INCLUDE_DIR
+			mediastream.h
+			PATHS ${mediastreamer2_INCLUDE_SEARCHPATH} /usr/include/mediastreamer2
+			DOC "Location of the external mediastreamer2 headers"
+			)
+MARK_AS_ADVANCED(mediastreamer2_INCLUDE_DIR)
+
+FIND_LIBRARY(mediastreamer2_LIBRARY
+			NAMES ${mediastreamer2_LIBRARY_NAME}
+			PATHS ${mediastreamer2_LIBRARY_DIR}
+			DOC "Path to the external mediastreamer2 library"
+			)
+MARK_AS_ADVANCED(mediastreamer2_LIBRARY)
+
+
+STRING(COMPARE EQUAL "${mediastreamer2_INCLUDE_DIR}" "mediastreamer2_INCLUDE-NOTFOUND" mediastreamer2_INCLUDE_NOTFOUND)
+STRING(COMPARE EQUAL "${mediastreamer2_LIBRARY}" "mediastreamer2_LIBRARY-NOTFOUND" mediastreamer2_LIBRARY_NOTFOUND)
+
+IF(NOT mediastreamer2_LIBRARY_NOTFOUND AND NOT mediastreamer2_INCLUDE_NOTFOUND)
+	SET(mediastreamer2_FOUND 1)
+ENDIF(NOT mediastreamer2_LIBRARY_NOTFOUND AND NOT mediastreamer2_INCLUDE_NOTFOUND)
+
--- qutecom/DefineQuteComOptions.cmake	2011-08-31 00:39:44.000000000 +0300
+++ qutecom/DefineQuteComOptions.cmake	2011-09-14 14:36:06.426662130 +0300
@@ -72,3 +72,4 @@
 option(OSIP2_INTERNAL "internal osip2" ON)
 option(EXOSIP2_INTERNAL "internal eXosip2" ON)
 option(ORTP_INTERNAL "internal ortp" ON)
+option(MEDIASTREAMER2_INTERNAL "internal mediastreamer2" ON)
--- qutecom/engine/qutecom-verona/mediastreamer2/CMakeLists-external.txt	1970-01-01 03:00:00.000000000 +0300
+++ qutecom/engine/qutecom-verona/mediastreamer2/CMakeLists-external.txt	2011-09-14 14:36:58.872141787 +0300
@@ -0,0 +1,9 @@
+if (NOT MEDIASTREAMER2_FOUND)
+	find_package(MEDIASTREAMER2 REQUIRED)
+endif (NOT MEDIASTREAMER2_FOUND)
+
+create_project(mediastreamer2)
+
+use_public_libraries(
+	mediastreamer2
+)
--- qutecom/engine/qutecom-verona/mediastreamer2/CMakeLists-internal.txt	1970-01-01 03:00:00.000000000 +0300
+++ qutecom/engine/qutecom-verona/mediastreamer2/CMakeLists-internal.txt	2011-08-31 22:19:15.000000000 +0300
@@ -0,0 +1,253 @@
+include(TestBigEndian)
+create_shared_library(mediastreamer2)
+
+set(PACKAGE "mediastreamer2")
+set(PACKAGE_BUGREPORT "mediastreamer2")
+set(PACKAGE_NAME "mediastreamer2")
+set(PACKAGE_STRING "${PACKAGE} ${ORTP_VERSION}")
+set(PACKAGE_PLUGINS_DIR "plugins/")
+
+
+configure_file("${VERONA_BASE_DIR}/mediastreamer2/src/mediastreamer-config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/mediastreamer-config.h")
+
+add_private_compile_flags(
+	${PHAPI_OPTIMIZATION_FLAGS}
+)
+
+add_public_include_dirs(	
+	${VERONA_BASE_DIR}/mediastreamer2/include
+	${VERONA_BASE_DIR}/mediastreamer2/include/mediastreamer2
+)
+
+add_private_include_dirs(
+	${CMAKE_CURRENT_BINARY_DIR}/
+	${CMAKE_CURRENT_SOURCE_DIR}/build
+	${VERONA_BASE_DIR}/mediastreamer2/
+	${VERONA_BASE_DIR}/mediastreamer2/src
+)
+
+use_private_libraries(
+	gsm
+	libspeex
+	libresample	
+)
+
+use_public_libraries(
+	ortp
+	ffmpeg
+)
+
+add_private_definitions(
+	-DMS2_INTERNAL
+)
+
+if(PHAPI_VIDEO_SUPPORT)
+	add_private_definitions(
+		-DVIDEO_ENABLED
+		-DHAVE_LIBAVCODEC_AVCODEC_H
+		-DHAVE_LIBSWSCALE_SWSCALE_H
+	)
+	
+	if(PHAPI_CODEC_THEORA_SUPPORT)
+		use_private_libraries(
+			libtheora
+		)
+		add_sources(
+			${VERONA_BASE_DIR}/mediastreamer2/src/theora.c
+		)
+	endif(PHAPI_CODEC_THEORA_SUPPORT)
+	
+	if(PHAPI_CODEC_H264_SUPPORT)
+		add_sources(
+			${VERONA_BASE_DIR}/mediastreamer2/src/h264dec.c
+		)
+	endif(PHAPI_CODEC_H264_SUPPORT)
+	
+	add_sources(	
+		${VERONA_BASE_DIR}/mediastreamer2/src/videoenc.c  
+		${VERONA_BASE_DIR}/mediastreamer2/src/videodec.c  
+		${VERONA_BASE_DIR}/mediastreamer2/src/pixconv.c   
+		${VERONA_BASE_DIR}/mediastreamer2/src/sizeconv.c  
+		${VERONA_BASE_DIR}/mediastreamer2/src/rfc3984.c   
+		${VERONA_BASE_DIR}/mediastreamer2/src/mswebcam.c  
+		${VERONA_BASE_DIR}/mediastreamer2/src/nowebcam.c  
+		${VERONA_BASE_DIR}/mediastreamer2/src/mire.c	   
+		${VERONA_BASE_DIR}/mediastreamer2/src/extdisplay.c  
+		${VERONA_BASE_DIR}/mediastreamer2/src/msvideo.c   
+		${VERONA_BASE_DIR}/mediastreamer2/src/videostream.c
+	)
+endif(PHAPI_VIDEO_SUPPORT)
+
+if(PHAPI_AUDIO_ALSA_SUPPORT)
+	add_sources(
+		${VERONA_BASE_DIR}/mediastreamer2/src/alsa.c
+	)
+	use_public_libraries(
+		alsa
+	)
+	add_private_definitions(
+		-D__ALSA_ENABLED__
+	)
+endif(PHAPI_AUDIO_ALSA_SUPPORT)
+
+if(PHAPI_AUDIO_ARTS_SUPPORT)
+	add_sources(
+		${VERONA_BASE_DIR}/mediastreamer2/src/arts.c
+	)
+	use_public_libraries(
+		arts
+	)
+	add_private_definitions(
+		-D__ARTS_ENABLED__
+	)
+endif(PHAPI_AUDIO_ARTS_SUPPORT)
+
+if(PHAPI_AUDIO_PORTAUDIO_SUPPORT)
+	add_sources(
+		${VERONA_BASE_DIR}/mediastreamer2/src/pasnd.c
+	)
+	use_public_libraries(
+		portaudio
+	)
+	add_private_definitions(
+		-D__PORTAUDIO_ENABLED__
+	)
+endif(PHAPI_AUDIO_PORTAUDIO_SUPPORT)
+
+add_private_definitions(
+	-DHAVE_CONFIG_H
+	-DRTP_MAX_SIZE=8192
+	-DORTP_INET6
+)
+
+TEST_BIG_ENDIAN(BIG_ENDIAN)
+if (BIG_ENDIAN)
+	add_public_definitions(
+		-DORTP_BIGENDIAN
+		-DWORDS_BIGENDIAN
+	)
+endif (BIG_ENDIAN)
+
+add_sources(
+	${VERONA_BASE_DIR}/mediastreamer2/src/eventqueue.c
+	${VERONA_BASE_DIR}/mediastreamer2/src/mscommon.c  
+	${VERONA_BASE_DIR}/mediastreamer2/src/msfilter.c  
+	${VERONA_BASE_DIR}/mediastreamer2/src/msqueue.c   
+	${VERONA_BASE_DIR}/mediastreamer2/src/msticker.c  
+	${VERONA_BASE_DIR}/mediastreamer2/src/alaw.c	   
+	${VERONA_BASE_DIR}/mediastreamer2/src/ulaw.c	   
+	${VERONA_BASE_DIR}/mediastreamer2/src/mssndcard.c 
+	${VERONA_BASE_DIR}/mediastreamer2/src/msrtp.c	   
+	${VERONA_BASE_DIR}/mediastreamer2/src/dtmfgen.c   
+	${VERONA_BASE_DIR}/mediastreamer2/src/ice.c	   
+	${VERONA_BASE_DIR}/mediastreamer2/src/tee.c	   
+	${VERONA_BASE_DIR}/mediastreamer2/src/msconf.c	   
+	${VERONA_BASE_DIR}/mediastreamer2/src/msjoin.c	   
+	${VERONA_BASE_DIR}/mediastreamer2/src/msvolume.c  
+	${VERONA_BASE_DIR}/mediastreamer2/src/audiostream.c
+	${VERONA_BASE_DIR}/mediastreamer2/src/msresample.c	   	   	   
+	${VERONA_BASE_DIR}/mediastreamer2/src/msspeex.c   
+	${VERONA_BASE_DIR}/mediastreamer2/src/speexec.c   
+	${VERONA_BASE_DIR}/mediastreamer2/src/gsm.c	   
+	${VERONA_BASE_DIR}/mediastreamer2/src/mtu.c	
+	${VERONA_BASE_DIR}/mediastreamer2/src/void.c
+	${VERONA_BASE_DIR}/mediastreamer2/src/equalizer.c
+	${VERONA_BASE_DIR}/mediastreamer2/src/dsptools.c
+	${VERONA_BASE_DIR}/mediastreamer2/src/kiss_fftr.c
+	${VERONA_BASE_DIR}/mediastreamer2/src/kiss_fft.c
+	${VERONA_BASE_DIR}/mediastreamer2/src/audiomixer.c
+	${VERONA_BASE_DIR}/mediastreamer2/src/tonedetector.c
+	${VERONA_BASE_DIR}/mediastreamer2/src/itc.c
+	${VERONA_BASE_DIR}/mediastreamer2/src/chanadapt.c
+)
+
+if (WIN32)
+	add_private_libraries(
+		ws2_32
+		winmm
+		strmiids
+		comsuppw
+	)
+	
+	#add_private_include_dirs(
+	#	"C:/Program Files/Microsoft Platform SDK/Samples/Multimedia/DirectShow/BaseClasses/"
+	#)
+	
+	#add_private_definitions(
+	#	-DHAVE_DIRECTSHOW
+	#)
+
+	if(PHAPI_VIDEO_SUPPORT)
+		
+		add_private_definitions(
+			-DHAVE_VFW
+		)
+		
+		add_sources(
+			${VERONA_BASE_DIR}/mediastreamer2/src/winvideo2.c 
+		)
+		
+		add_private_libraries(
+			Vfw32.lib
+		)
+	endif(PHAPI_VIDEO_SUPPORT)
+	
+	add_sources(
+		#${VERONA_BASE_DIR}/mediastreamer2/src/dxfilter.cpp 
+		${VERONA_BASE_DIR}/mediastreamer2/src/winsnd3.c
+		#${VERONA_BASE_DIR}/mediastreamer2/src/winsndds.cpp
+		${VERONA_BASE_DIR}/mediastreamer2/src/msfileplayer_win.c
+		${VERONA_BASE_DIR}/mediastreamer2/src/msfilerec_win.c 
+	)
+else (WIN32)
+	add_sources(
+		${VERONA_BASE_DIR}/mediastreamer2/src/msfileplayer.c
+		${VERONA_BASE_DIR}/mediastreamer2/src/msfilerec.c 
+	)
+
+	if(LINUX AND PHAPI_VIDEO_SUPPORT)
+		add_sources(
+			${VERONA_BASE_DIR}/mediastreamer2/src/msv4l2.c
+			#			${VERONA_BASE_DIR}/mediastreamer2/src/msv4l.c
+		)
+
+		add_private_libraries(
+			v4l2
+		)
+		add_private_definitions(
+			-DHAVE_DLOPEN
+			-DHAVE_V4L2
+			-DV4L2_THREADED
+			-DHAVE_LINUX_VIDEODEV2_H
+			#-DHAVE_V4L1
+		)
+	endif(LINUX AND PHAPI_VIDEO_SUPPORT)
+
+	if (APPLE)
+		add_private_definitions(
+			-DHAVE_DLOPEN
+			-D__MAC_AQ_ENABLED__
+		)
+		
+		add_sources(
+			${VERONA_BASE_DIR}/mediastreamer2/src/aqsnd.c	   
+		)
+		
+		if(PHAPI_VIDEO_SUPPORT)
+			add_sources(
+				${VERONA_BASE_DIR}/mediastreamer2/src/qtcapture.m
+			)
+		endif(PHAPI_VIDEO_SUPPORT)
+		
+		use_public_frameworks(
+			CoreAudio
+			AudioToolbox
+			AudioUnit
+			QTKit
+			QuartzCore
+			Cocoa
+		)
+	endif(APPLE)
+endif (WIN32)
+
+create_project_binary()
--- qutecom/engine/qutecom-verona/mediastreamer2/CMakeLists.txt	2011-08-31 22:19:15.000000000 +0300
+++ qutecom/engine/qutecom-verona/mediastreamer2/CMakeLists.txt	2011-09-14 14:36:30.364424570 +0300
@@ -1,253 +1,5 @@
-include(TestBigEndian)
-create_shared_library(mediastreamer2)
-
-set(PACKAGE "mediastreamer2")
-set(PACKAGE_BUGREPORT "mediastreamer2")
-set(PACKAGE_NAME "mediastreamer2")
-set(PACKAGE_STRING "${PACKAGE} ${ORTP_VERSION}")
-set(PACKAGE_PLUGINS_DIR "plugins/")
-
-
-configure_file("${VERONA_BASE_DIR}/mediastreamer2/src/mediastreamer-config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/mediastreamer-config.h")
-
-add_private_compile_flags(
-	${PHAPI_OPTIMIZATION_FLAGS}
-)
-
-add_public_include_dirs(	
-	${VERONA_BASE_DIR}/mediastreamer2/include
-	${VERONA_BASE_DIR}/mediastreamer2/include/mediastreamer2
-)
-
-add_private_include_dirs(
-	${CMAKE_CURRENT_BINARY_DIR}/
-	${CMAKE_CURRENT_SOURCE_DIR}/build
-	${VERONA_BASE_DIR}/mediastreamer2/
-	${VERONA_BASE_DIR}/mediastreamer2/src
-)
-
-use_private_libraries(
-	gsm
-	libspeex
-	libresample	
-)
-
-use_public_libraries(
-	ortp
-	ffmpeg
-)
-
-add_private_definitions(
-	-DMS2_INTERNAL
-)
-
-if(PHAPI_VIDEO_SUPPORT)
-	add_private_definitions(
-		-DVIDEO_ENABLED
-		-DHAVE_LIBAVCODEC_AVCODEC_H
-		-DHAVE_LIBSWSCALE_SWSCALE_H
-	)
-	
-	if(PHAPI_CODEC_THEORA_SUPPORT)
-		use_private_libraries(
-			libtheora
-		)
-		add_sources(
-			${VERONA_BASE_DIR}/mediastreamer2/src/theora.c
-		)
-	endif(PHAPI_CODEC_THEORA_SUPPORT)
-	
-	if(PHAPI_CODEC_H264_SUPPORT)
-		add_sources(
-			${VERONA_BASE_DIR}/mediastreamer2/src/h264dec.c
-		)
-	endif(PHAPI_CODEC_H264_SUPPORT)
-	
-	add_sources(	
-		${VERONA_BASE_DIR}/mediastreamer2/src/videoenc.c  
-		${VERONA_BASE_DIR}/mediastreamer2/src/videodec.c  
-		${VERONA_BASE_DIR}/mediastreamer2/src/pixconv.c   
-		${VERONA_BASE_DIR}/mediastreamer2/src/sizeconv.c  
-		${VERONA_BASE_DIR}/mediastreamer2/src/rfc3984.c   
-		${VERONA_BASE_DIR}/mediastreamer2/src/mswebcam.c  
-		${VERONA_BASE_DIR}/mediastreamer2/src/nowebcam.c  
-		${VERONA_BASE_DIR}/mediastreamer2/src/mire.c	   
-		${VERONA_BASE_DIR}/mediastreamer2/src/extdisplay.c  
-		${VERONA_BASE_DIR}/mediastreamer2/src/msvideo.c   
-		${VERONA_BASE_DIR}/mediastreamer2/src/videostream.c
-	)
-endif(PHAPI_VIDEO_SUPPORT)
-
-if(PHAPI_AUDIO_ALSA_SUPPORT)
-	add_sources(
-		${VERONA_BASE_DIR}/mediastreamer2/src/alsa.c
-	)
-	use_public_libraries(
-		alsa
-	)
-	add_private_definitions(
-		-D__ALSA_ENABLED__
-	)
-endif(PHAPI_AUDIO_ALSA_SUPPORT)
-
-if(PHAPI_AUDIO_ARTS_SUPPORT)
-	add_sources(
-		${VERONA_BASE_DIR}/mediastreamer2/src/arts.c
-	)
-	use_public_libraries(
-		arts
-	)
-	add_private_definitions(
-		-D__ARTS_ENABLED__
-	)
-endif(PHAPI_AUDIO_ARTS_SUPPORT)
-
-if(PHAPI_AUDIO_PORTAUDIO_SUPPORT)
-	add_sources(
-		${VERONA_BASE_DIR}/mediastreamer2/src/pasnd.c
-	)
-	use_public_libraries(
-		portaudio
-	)
-	add_private_definitions(
-		-D__PORTAUDIO_ENABLED__
-	)
-endif(PHAPI_AUDIO_PORTAUDIO_SUPPORT)
-
-add_private_definitions(
-	-DHAVE_CONFIG_H
-	-DRTP_MAX_SIZE=8192
-	-DORTP_INET6
-)
-
-TEST_BIG_ENDIAN(BIG_ENDIAN)
-if (BIG_ENDIAN)
-	add_public_definitions(
-		-DORTP_BIGENDIAN
-		-DWORDS_BIGENDIAN
-	)
-endif (BIG_ENDIAN)
-
-add_sources(
-	${VERONA_BASE_DIR}/mediastreamer2/src/eventqueue.c
-	${VERONA_BASE_DIR}/mediastreamer2/src/mscommon.c  
-	${VERONA_BASE_DIR}/mediastreamer2/src/msfilter.c  
-	${VERONA_BASE_DIR}/mediastreamer2/src/msqueue.c   
-	${VERONA_BASE_DIR}/mediastreamer2/src/msticker.c  
-	${VERONA_BASE_DIR}/mediastreamer2/src/alaw.c	   
-	${VERONA_BASE_DIR}/mediastreamer2/src/ulaw.c	   
-	${VERONA_BASE_DIR}/mediastreamer2/src/mssndcard.c 
-	${VERONA_BASE_DIR}/mediastreamer2/src/msrtp.c	   
-	${VERONA_BASE_DIR}/mediastreamer2/src/dtmfgen.c   
-	${VERONA_BASE_DIR}/mediastreamer2/src/ice.c	   
-	${VERONA_BASE_DIR}/mediastreamer2/src/tee.c	   
-	${VERONA_BASE_DIR}/mediastreamer2/src/msconf.c	   
-	${VERONA_BASE_DIR}/mediastreamer2/src/msjoin.c	   
-	${VERONA_BASE_DIR}/mediastreamer2/src/msvolume.c  
-	${VERONA_BASE_DIR}/mediastreamer2/src/audiostream.c
-	${VERONA_BASE_DIR}/mediastreamer2/src/msresample.c	   	   	   
-	${VERONA_BASE_DIR}/mediastreamer2/src/msspeex.c   
-	${VERONA_BASE_DIR}/mediastreamer2/src/speexec.c   
-	${VERONA_BASE_DIR}/mediastreamer2/src/gsm.c	   
-	${VERONA_BASE_DIR}/mediastreamer2/src/mtu.c	
-	${VERONA_BASE_DIR}/mediastreamer2/src/void.c
-	${VERONA_BASE_DIR}/mediastreamer2/src/equalizer.c
-	${VERONA_BASE_DIR}/mediastreamer2/src/dsptools.c
-	${VERONA_BASE_DIR}/mediastreamer2/src/kiss_fftr.c
-	${VERONA_BASE_DIR}/mediastreamer2/src/kiss_fft.c
-	${VERONA_BASE_DIR}/mediastreamer2/src/audiomixer.c
-	${VERONA_BASE_DIR}/mediastreamer2/src/tonedetector.c
-	${VERONA_BASE_DIR}/mediastreamer2/src/itc.c
-	${VERONA_BASE_DIR}/mediastreamer2/src/chanadapt.c
-)
-
-if (WIN32)
-	add_private_libraries(
-		ws2_32
-		winmm
-		strmiids
-		comsuppw
-	)
-	
-	#add_private_include_dirs(
-	#	"C:/Program Files/Microsoft Platform SDK/Samples/Multimedia/DirectShow/BaseClasses/"
-	#)
-	
-	#add_private_definitions(
-	#	-DHAVE_DIRECTSHOW
-	#)
-
-	if(PHAPI_VIDEO_SUPPORT)
-		
-		add_private_definitions(
-			-DHAVE_VFW
-		)
-		
-		add_sources(
-			${VERONA_BASE_DIR}/mediastreamer2/src/winvideo2.c 
-		)
-		
-		add_private_libraries(
-			Vfw32.lib
-		)
-	endif(PHAPI_VIDEO_SUPPORT)
-	
-	add_sources(
-		#${VERONA_BASE_DIR}/mediastreamer2/src/dxfilter.cpp 
-		${VERONA_BASE_DIR}/mediastreamer2/src/winsnd3.c
-		#${VERONA_BASE_DIR}/mediastreamer2/src/winsndds.cpp
-		${VERONA_BASE_DIR}/mediastreamer2/src/msfileplayer_win.c
-		${VERONA_BASE_DIR}/mediastreamer2/src/msfilerec_win.c 
-	)
-else (WIN32)
-	add_sources(
-		${VERONA_BASE_DIR}/mediastreamer2/src/msfileplayer.c
-		${VERONA_BASE_DIR}/mediastreamer2/src/msfilerec.c 
-	)
-
-	if(LINUX AND PHAPI_VIDEO_SUPPORT)
-		add_sources(
-			${VERONA_BASE_DIR}/mediastreamer2/src/msv4l2.c
-			#			${VERONA_BASE_DIR}/mediastreamer2/src/msv4l.c
-		)
-
-		add_private_libraries(
-			v4l2
-		)
-		add_private_definitions(
-			-DHAVE_DLOPEN
-			-DHAVE_V4L2
-			-DV4L2_THREADED
-			-DHAVE_LINUX_VIDEODEV2_H
-			#-DHAVE_V4L1
-		)
-	endif(LINUX AND PHAPI_VIDEO_SUPPORT)
-
-	if (APPLE)
-		add_private_definitions(
-			-DHAVE_DLOPEN
-			-D__MAC_AQ_ENABLED__
-		)
-		
-		add_sources(
-			${VERONA_BASE_DIR}/mediastreamer2/src/aqsnd.c	   
-		)
-		
-		if(PHAPI_VIDEO_SUPPORT)
-			add_sources(
-				${VERONA_BASE_DIR}/mediastreamer2/src/qtcapture.m
-			)
-		endif(PHAPI_VIDEO_SUPPORT)
-		
-		use_public_frameworks(
-			CoreAudio
-			AudioToolbox
-			AudioUnit
-			QTKit
-			QuartzCore
-			Cocoa
-		)
-	endif(APPLE)
-endif (WIN32)
-
-create_project_binary()
+if (MEDIASTREAMER2_INTERNAL)
+	include(CMakeLists-internal.txt)
+else (MEDIASTREAMER2_INTERNAL)
+	include(CMakeLists-external.txt)
+endif (MEDIASTREAMER2_INTERNAL)
--- qutecom/engine/qutecom-verona/mediastreamer2/plugins/CMakeLists-internal.txt	1970-01-01 03:00:00.000000000 +0300
+++ qutecom/engine/qutecom-verona/mediastreamer2/plugins/CMakeLists-internal.txt	2011-06-17 02:45:54.000000000 +0300
@@ -0,0 +1,40 @@
+if (APPLE)
+	make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${APPLICATION_NAME}.app/Contents/plugins/mediastreamer2)
+endif (APPLE)
+
+if (WIN32 OR LINUX)
+	make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/plugins/mediastreamer2)
+endif (WIN32 OR LINUX)
+
+if(PHAPI_CODEC_ILBC_SUPPORT)
+	subdirs(
+		msilbc
+	)
+endif(PHAPI_CODEC_ILBC_SUPPORT)
+
+if(PHAPI_CODEC_G722_SUPPORT)
+	subdirs(
+		msg722
+	)
+endif(PHAPI_CODEC_G722_SUPPORT)
+
+if(PHAPI_CODEC_G726_SUPPORT)
+	subdirs(
+		msg726
+	)
+endif(PHAPI_CODEC_G726_SUPPORT)
+
+if(PHAPI_CODEC_AMR_SUPPORT)
+	subdirs(
+		msamr
+	)
+endif(PHAPI_CODEC_AMR_SUPPORT)
+
+
+if(PHAPI_VIDEO_SUPPORT)
+	if(PHAPI_CODEC_H264_SUPPORT)
+		subdirs(
+			msx264
+		)
+	endif(PHAPI_CODEC_H264_SUPPORT)
+endif(PHAPI_VIDEO_SUPPORT)
--- qutecom/engine/qutecom-verona/mediastreamer2/plugins/CMakeLists.txt	2011-06-17 02:45:54.000000000 +0300
+++ qutecom/engine/qutecom-verona/mediastreamer2/plugins/CMakeLists.txt	2011-09-14 14:37:27.662856334 +0300
@@ -1,40 +1,3 @@
-if (APPLE)
-	make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${APPLICATION_NAME}.app/Contents/plugins/mediastreamer2)
-endif (APPLE)
-
-if (WIN32 OR LINUX)
-	make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/plugins/mediastreamer2)
-endif (WIN32 OR LINUX)
-
-if(PHAPI_CODEC_ILBC_SUPPORT)
-	subdirs(
-		msilbc
-	)
-endif(PHAPI_CODEC_ILBC_SUPPORT)
-
-if(PHAPI_CODEC_G722_SUPPORT)
-	subdirs(
-		msg722
-	)
-endif(PHAPI_CODEC_G722_SUPPORT)
-
-if(PHAPI_CODEC_G726_SUPPORT)
-	subdirs(
-		msg726
-	)
-endif(PHAPI_CODEC_G726_SUPPORT)
-
-if(PHAPI_CODEC_AMR_SUPPORT)
-	subdirs(
-		msamr
-	)
-endif(PHAPI_CODEC_AMR_SUPPORT)
-
-
-if(PHAPI_VIDEO_SUPPORT)
-	if(PHAPI_CODEC_H264_SUPPORT)
-		subdirs(
-			msx264
-		)
-	endif(PHAPI_CODEC_H264_SUPPORT)
-endif(PHAPI_VIDEO_SUPPORT)
+if (MEDIASTREAMER2_INTERNAL)
+	include(CMakeLists-internal.txt)
+endif (MEDIASTREAMER2_INTERNAL)