From 03ddd98b21f4379f59a980534d55e7d704034f1f Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 9 May 2011 15:20:56 +0200
Subject: [PATCH] fix macosx integration (was broken)

---
 configure.ac   | 19 ++++++++-----------
 mediastreamer2 |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 014f60e8f..556941c0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,14 @@ dnl AC_CHECK_LIB(intl,libintl_gettext)
 
 AC_CHECK_FUNCS([get_current_dir_name strndup stpcpy] )
 
+AC_ARG_ENABLE(x11,
+			  [  --disable-x11    Disable X11 support],
+		 	  [case "${enableval}" in
+			  yes) enable_x11=true ;;
+			  no)  enable_x11=false ;;
+			  *) AC_MSG_ERROR(bad value ${enableval} for --disable-x11) ;;
+		  	  esac],[enable_x11=true])
+
 dnl conditionnal build of console interface.
 AC_ARG_ENABLE(console_ui,
       [  --enable-console_ui=[yes/no]    Turn on or off compilation of console interface [default=yes]],
@@ -229,17 +237,6 @@ else
 	package_prefix=${prefix}
 fi
 
-
-AC_ARG_ENABLE(x11,
-			  [  --disable-x11    Disable X11 support],
-		 	  [case "${enableval}" in
-			  yes) enable_x11=true ;;
-			  no)  enable_x11=false ;;
-			  *) AC_MSG_ERROR(bad value ${enableval} for --disable-x11) ;;
-		  	  esac],[enable_x11=true])
-
-
-
 if test "$relativeprefix" = "auto" ; then
 	case $target_os in
 		*darwin*)
diff --git a/mediastreamer2 b/mediastreamer2
index f427cdc37..cd270c165 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit f427cdc370d07696406a33eb2241ccac5ba17d46
+Subproject commit cd270c165f205954bd16ca76d0be2dff8f92cbd5