add armv7s support for IOS

Conflicts:

	mediastreamer2

diff --git a/configure.ac b/configure.ac
index 6e68f7ba10a70445bb7df6573b8859aad8f12e1c..4c4bab8828ceb2d929854b2ac10abcd311cbc42f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ case $target in
                CONSOLE_FLAGS="-mconsole"
                mingw_found=yes
        ;;
-       armv6-apple-darwin|armv7-apple-darwin|i386-apple-darwin)
+       armv6-apple-darwin|armv7-apple-darwin|i386-apple-darwin|armv7s-apple-darwin)
                 CFLAGS="$CFLAGS -DTARGET_OS_IPHONE "
                 build_tests=no
                 ios_found=yes

diff --git a/m4/exosip.m4 b/m4/exosip.m4
index 129b28570a3ee72c21f6a6ea2d5d69dd57fd6e60..aa4b7a9c304a095830301916f356d5225d561e44 100644 (file)
--- a/m4/exosip.m4
+++ b/m4/exosip.m4
@@ -5,13 +5,7 @@ AC_REQUIRE([LP_CHECK_OSIP2])
 
 
 case $host_alias in
-       i386-apple*)
-               OSIP_LIBS="$OSIP_LIBS  -framework CoreFoundation -framework CFNetwork -lresolv"
-       ;;
-       armv6-apple*)
-               OSIP_LIBS="$OSIP_LIBS  -framework CoreFoundation -framework CFNetwork -lresolv"
-       ;;
-       armv7-apple*)
+       i386-apple*|armv6-apple*|armv7-apple*|armv7s-apple*)
                OSIP_LIBS="$OSIP_LIBS  -framework CoreFoundation -framework CFNetwork -lresolv"
        ;;
        x86_64-apple*)

diff --git a/mediastreamer2 b/mediastreamer2
index bc1d91a891a04858b43d6e08fa1136d2c3b9c6a2..02dc872f0f85986b7691b4ac911da7825f185a3e 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit bc1d91a891a04858b43d6e08fa1136d2c3b9c6a2
+Subproject commit 02dc872f0f85986b7691b4ac911da7825f185a3e