diff --git a/linphone/README.macos b/linphone/README.macos index dcaecfde8..6d3851503 100644 --- a/linphone/README.macos +++ b/linphone/README.macos @@ -5,7 +5,7 @@ It was tested on macos X (leopard) on september 2009. Requirements: * xcode (for gcc) -* the 'port' command to install various dependencies +* macport (GNU porting project) * svn or git checkout'd linphone tree. Steps: @@ -13,9 +13,14 @@ Steps: - automake - autoconf - libtool + - gettext - intltool - gtk2 + - libglade2 - speex-dev + - osip2 + - eXosip2 + * add /opt/local/bin to your PATH by editing (or creating) ~/.profile, logout and login again for changes to take effect * within linphone source directory, run ./autogen.sh diff --git a/linphone/mediastreamer2/src/aqsnd.c b/linphone/mediastreamer2/src/aqsnd.c index e2325c4ea..3748d7f6b 100644 --- a/linphone/mediastreamer2/src/aqsnd.c +++ b/linphone/mediastreamer2/src/aqsnd.c @@ -463,8 +463,8 @@ static void aq_start_w(MSSndCard *card){ &d->writeAudioFormat, writeCallback, d, - CFRunLoopGetCurrent (), - kCFRunLoopCommonModes, + NULL,/*CFRunLoopGetCurrent ()*/ + NULL,/*kCFRunLoopCommonModes*/ 0, // run loop flags &d->writeQueue ); diff --git a/linphone/po/Makefile.in.in b/linphone/po/Makefile.in.in index c7e83022c..402a25f7a 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)