From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 13 Jul 2011 08:29:59 +0000 (+0200)
Subject: auto tools port for ios video
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=c22169c221f91dcf38347410deff544f2786185f

auto tools port for ios video
---

diff --git a/configure.ac b/configure.ac
index 08bcd8bf..77251262 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ AM_PROG_CC_STDC
 AC_HEADER_STDC
 AM_PROG_CC_C_O
 
-case $target_os in
+case $target in
 	*mingw32ce)
        	CFLAGS="$CFLAGS -D_WIN32_WCE -DORTP_STATIC -D_WIN32_WINNT=0x0501"
        	CXXFLAGS="$CXXFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501"
@@ -58,11 +58,18 @@ case $target_os in
 		CONSOLE_FLAGS="-mconsole"
 		mingw_found=yes
 	;;
-	*darwin*)
+       armv6-apple-darwin|armv7-apple-darwin|i386-apple-darwin)
+                CFLAGS="$CFLAGS -DTARGET_OS_IPHONE "
+                build_tests=no
+                ios_found=yes
+        ;;
+        x86_64-apple-darwin*|i686-apple-darwin*)
+                MSPLUGINS_CFLAGS=""
 		dnl use macport installation
 		ACLOCAL_MACOS_FLAGS="-I /opt/local/share/aclocal"
 		build_macos=yes
-	;;
+        ;;
+
 esac
 
 AC_SUBST(ACLOCAL_MACOS_FLAGS)
@@ -72,6 +79,7 @@ AC_SUBST(GUI_FLAGS)
 dnl localization tools
 IT_PROG_INTLTOOL([0.40], [no-xml])
 
+AM_CONDITIONAL(BUILD_TESTS,test x$build_tests != xno)
 dnl Initialize libtool
 LT_INIT([win32-dll shared disable-static])
 
diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index a362dda8..0801eebd 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -49,7 +49,7 @@ liblinphone_la_LIBADD= \
 if BUILD_WIN32
 liblinphone_la_LIBADD+=$(top_builddir)/oRTP/src/libortp.la
 endif
-
+if BUILD_TESTS
 noinst_PROGRAMS=test_lsd test_ecc
 
 test_lsd_SOURCES=test_lsd.c
@@ -60,7 +60,7 @@ test_ecc_SOURCES=test_ecc.c
 
 test_ecc_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
 
-
+endif
 
 AM_CFLAGS=$(STRICT_OPTIONS)  -DIN_LINPHONE \
 	$(ORTP_CFLAGS) \
diff --git a/coreapi/help/Makefile.am b/coreapi/help/Makefile.am
index 74767bea..7f8ea0aa 100644
--- a/coreapi/help/Makefile.am
+++ b/coreapi/help/Makefile.am
@@ -33,7 +33,7 @@ clean-local:
 	rm -rf doc
 
 #tutorials
-
+if BUILD_TESTS
 noinst_PROGRAMS=helloworld registration buddy_status chatroom
 
 helloworld_SOURCES=helloworld.c
@@ -58,7 +58,7 @@ LINPHONE_TUTOS+=$(chatroom_SOURCES)
 
 chatroom_LDADD=$(helloworld_LDADD)
 												
-				
+endif			
 
 INCLUDES=-I$(top_srcdir)/coreapi \
 		$(MEDIASTREAMER_CFLAGS)
diff --git a/mediastreamer2 b/mediastreamer2
index 213c8169..3d8b6a5f 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 213c8169a449f5e559dacd132bace6b508b02e2e
+Subproject commit 3d8b6a5f9b974440046430ec1998bab623c07366