fix macosx integration (was broken)

diff --git a/configure.ac b/configure.ac
index 014f60e8faa8af435e8129aced9e0c9c7fb0b9a2..556941c0e4180a6fe3ce3e4d0effaeb9569829e9 100644 (file)
--- 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 f427cdc370d07696406a33eb2241ccac5ba17d46..cd270c165f205954bd16ca76d0be2dff8f92cbd5 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit f427cdc370d07696406a33eb2241ccac5ba17d46
+Subproject commit cd270c165f205954bd16ca76d0be2dff8f92cbd5