From 3995caba7432bd994362a4a705fc601029158934 Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Mon, 31 Aug 2009 09:27:03 +0000
Subject: [PATCH] debug mediastreamer2 compilation under macosx 10.5

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@610 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
 linphone/mediastreamer2/autogen.sh     | 14 ++++++++++++--
 linphone/mediastreamer2/configure.ac   |  1 +
 linphone/mediastreamer2/src/dsptools.c |  2 ++
 linphone/mediastreamer2/src/mscommon.c |  4 ++--
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/linphone/mediastreamer2/autogen.sh b/linphone/mediastreamer2/autogen.sh
index d7d269423..4268f6736 100755
--- a/linphone/mediastreamer2/autogen.sh
+++ b/linphone/mediastreamer2/autogen.sh
@@ -10,10 +10,20 @@ else
 	AUTOMAKE=automake-${AM_VERSION}
 fi
 
+if test -f /opt/local/bin/glibtoolize ; then
+	# darwin
+	LIBTOOLIZE=/opt/local/bin/glibtoolize
+else
+	LIBTOOLIZE=libtoolize
+fi
+if test -d /opt/local/share/aclocal ; then
+	ACLOCAL_ARGS="-I /opt/local/share/aclocal"
+fi
+
 echo "Generating build scripts in mediastreamer..."
 set -x
-libtoolize --copy --force
+$LIBTOOLIZE --copy --force
 autoheader
-$ACLOCAL 
+$ACLOCAL  $ACLOCAL_ARGS
 $AUTOMAKE --force-missing --add-missing --copy
 autoconf
diff --git a/linphone/mediastreamer2/configure.ac b/linphone/mediastreamer2/configure.ac
index 8e352d799..224803789 100644
--- a/linphone/mediastreamer2/configure.ac
+++ b/linphone/mediastreamer2/configure.ac
@@ -131,6 +131,7 @@ case $target_os in
 		MSPLUGINS_CFLAGS=""
 		MSPLUGINS_LIBS="-dynamiclib"
 		macosx_found=yes
+		LIBS="$LIBS -framework CoreFoundation -framework Cocoa"
 	;;
   	*mingw*)
 		CFLAGS="$CFLAGS -DINET6 -DORTP_INET6 -D_WIN32_WINNT=0x0501 -DORTP_STATIC"
diff --git a/linphone/mediastreamer2/src/dsptools.c b/linphone/mediastreamer2/src/dsptools.c
index 0aff106d8..71ea227a3 100644
--- a/linphone/mediastreamer2/src/dsptools.c
+++ b/linphone/mediastreamer2/src/dsptools.c
@@ -57,8 +57,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #else
+#if !defined(__APPLE__)
 #include <malloc.h>
 #endif
+#endif
 
 #define ALLOC(var,size,type) var = alloca(sizeof(type)*(size))
 
diff --git a/linphone/mediastreamer2/src/mscommon.c b/linphone/mediastreamer2/src/mscommon.c
index 446b95724..52a3ddf92 100644
--- a/linphone/mediastreamer2/src/mscommon.c
+++ b/linphone/mediastreamer2/src/mscommon.c
@@ -48,9 +48,9 @@ extern void __register_ffmpeg_encoders_if_possible(void);
 #include <dlfcn.h>
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(__GNUC__)
 #import <Cocoa/Cocoa.h>
-#include <Foundation/Foundation.h>
+#include <Foundation/Foundation.h> 
 #endif
 
 MSList *ms_list_new(void *data){