From 6265d9fff1bb353d2419401c716d09777ca5c73f Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@gmail.com>
Date: Fri, 25 Sep 2009 22:34:38 +0200
Subject: [PATCH] prepare iphone sdk compilation
---
linphone/Makefile.am | 1 -
linphone/configure.in | 1 -
linphone/mediastreamer2/configure.ac | 2 +-
linphone/mediastreamer2/src/aqsnd.c | 2 +-
linphone/po/Makefile.in.in | 2 +-
5 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/linphone/Makefile.am b/linphone/Makefile.am
index 9dea313bfb..1a8910fd50 100644
--- a/linphone/Makefile.am
+++ b/linphone/Makefile.am
@@ -146,4 +146,3 @@ Portfile-devel: $(top_srcdir)/scripts/Portfile-devel.tmpl dist
sed -e 's/\@VERSION\@/$(LINPHONE_VERSION)/g' \
-e 's/\@LINPHONE_MD5\@/$(shell md5sum linphone-$(VERSION).tar.gz | awk {'print $$1'})/' < $< > $@
-
diff --git a/linphone/configure.in b/linphone/configure.in
index 11b4ea2711..e054b38a8a 100644
--- a/linphone/configure.in
+++ b/linphone/configure.in
@@ -423,7 +423,6 @@ dnl ##################################################
AC_PATH_PROG(DOXYGEN,doxygen,false)
AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false)
-
AC_OUTPUT([
Makefile
m4/Makefile
diff --git a/linphone/mediastreamer2/configure.ac b/linphone/mediastreamer2/configure.ac
index 6559af89fe..6ee623a16f 100644
--- a/linphone/mediastreamer2/configure.ac
+++ b/linphone/mediastreamer2/configure.ac
@@ -134,7 +134,7 @@ case $target_os in
MSPLUGINS_CFLAGS=""
MSPLUGINS_LIBS="-dynamiclib"
macosx_found=yes
- LIBS="$LIBS -framework CoreFoundation -framework Cocoa"
+ LIBS="$LIBS -framework CoreFoundation -framework AudioToolbox -framework CoreAudio"
;;
*mingw32ce)
CFLAGS="$CFLAGS -DINET6 -DORTP_INET6 -D_WIN32_WINNT=0x0501 -D_WIN32_WCE -DORTP_STATIC"
diff --git a/linphone/mediastreamer2/src/aqsnd.c b/linphone/mediastreamer2/src/aqsnd.c
index b3317bbbd4..0c7f06bd86 100644
--- a/linphone/mediastreamer2/src/aqsnd.c
+++ b/linphone/mediastreamer2/src/aqsnd.c
@@ -53,7 +53,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <AudioToolbox/AudioToolbox.h>
-#if !defined(__AudioHardware_h__)
+#if (!defined(__AudioHardware_h__) & !defined(__IPHONE_3_0))
#include "AudioHardware.h"
#endif
diff --git a/linphone/po/Makefile.in.in b/linphone/po/Makefile.in.in
index 402a25f7ac..c7e83022c0 100644
--- a/linphone/po/Makefile.in.in
+++ b/linphone/po/Makefile.in.in
@@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
--
GitLab