diff --git a/configure.ac b/configure.ac
index 2e9834df7..b5d2f8679 100644
--- 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 a2641b65b..e73ae8a5e 100644
--- 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);