Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

diff --git a/configure.ac b/configure.ac
index 2e9834df7b07103ea82fd14fa24e8c922e5d2a8b..b5d2f86799f322a4ae053ab937facf1dca1dc902 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -239,7 +239,9 @@ fi
 if test "$relativeprefix" = "auto" ; then
        case $target_os in
                *darwin*)
-               relativeprefix=yes
+               if test "$enable_x11" = "false" ; then
+                       relativeprefix=yes
+               fi
                ;;
                *mingw*)
                relativeprefix=yes

diff --git a/gtk/main.c b/gtk/main.c
index a2641b65b49826ed2d06a709721bcf72358e715a..e73ae8a5e429e09992a147183a71f3ce0b22b7ee 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1266,7 +1266,7 @@ gboolean linphone_gtk_close(GtkWidget *mw){
                linphone_core_terminate_all_calls(lc);
        }
        linphone_core_enable_video_preview(lc,FALSE);
-#ifdef HAVE_GTK_OSX
+#ifdef __APPLE__ /*until with have a better option*/
        gtk_window_iconify(GTK_WINDOW(mw));
 #else
        gtk_widget_hide(mw);