Fix compilations issue with wizard (if not wanted)

diff --git a/configure.ac b/configure.ac
index 04e23a189ae454d9e0bb67bfb099c681de44fabf..d3c908585bec4ca0a150c3cc3356f3be6e1eefbf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -145,7 +145,7 @@ AC_ARG_ENABLE(gtk_ui,
       esac],[gtk_ui=true])
 
 if test "$gtk_ui" = "true" ; then
-       PKG_CHECK_MODULES(LIBGTK, gtk+-2.0 >= 2.22.0 gthread-2.0)
+       PKG_CHECK_MODULES(LIBGTK, gtk+-2.0 >= 2.18.0 gthread-2.0)
        if test "$enable_x11" = "false" ; then
                PKG_CHECK_MODULES(LIBGTKMAC,[ige-mac-integration >= 0.9.7 ])
                AC_DEFINE([HAVE_GTK_OSX],[1],[Defined when gtk osx is used])
@@ -417,6 +417,9 @@ PKG_CHECK_MODULES(LIBSOUP, [libsoup-2.4 >= 2.26],[build_wizard=true],foo=bar)
 AC_SUBST(LIBSOUP_CFLAGS)
 AC_SUBST(LIBSOUP_LIBS)
 AM_CONDITIONAL(BUILD_WIZARD, test x$build_wizard = xtrue)
+if test "$build_wizard" = "true" ; then
+   AC_DEFINE( BUILD_WIZARD, 1, [Define if wizard enabled] ) 
+fi
 
 ##################################################
 # Stricter build options (after external packages)

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e237b823cdbf48b036bda1f6b96e2b9b71a58f14..a4dceba61008745b1271f1009fc6c639d023d3e9 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -42,12 +42,15 @@ linphone_SOURCES=   \
                        update.c \
                        buddylookup.c \
                        utils.c \
-                       setupwizard.c\
                        incall_view.c \
                        loginframe.c \
                        singleinstance.c \
                        conference.c \
                        linphone.h 
+if BUILD_WIZARD
+linphone_SOURCES+=     \
+                       setupwizard.c
+endif
 
 linphone_LDADD=$(ORTP_LIBS) \
                $(MEDIASTREAMER_LIBS) \

diff --git a/gtk/main.c b/gtk/main.c
index 27c6f616586d5b931618cd2d771fa170a1b4790b..79e2eed24fb860635e1c665c2818d5351229d83d 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1586,12 +1586,14 @@ static void linphone_gtk_check_soundcards(){
        }
 }
 
+#ifdef BUILD_WIZARD
 // Display the account wizard
 void linphone_gtk_display_wizard() {
        if (the_wizard == NULL || !gtk_widget_get_visible(the_wizard)) { // Only one instance of the wizard at the same time
                the_wizard = linphone_gtk_create_assistant();
        }
 }
+#endif
 
 static void linphone_gtk_quit(void){
        static gboolean quit_done=FALSE;
@@ -1737,10 +1739,12 @@ int main(int argc, char *argv[]){
        gtk_timeout_add(30,(GtkFunction)linphone_gtk_check_logs,(gpointer)NULL);
        linphone_gtk_init_main_window();
 
+#ifdef BUILD_WIZARD
        // Veryfing if at least one sip account is configured. If not, show wizard
        if (linphone_core_get_proxy_config_list(linphone_gtk_get_core()) == NULL) {
                linphone_gtk_display_wizard();
        }
+#endif
 
 #ifndef HAVE_GTK_OSX
        linphone_gtk_init_status_icon();

diff --git a/mediastreamer2 b/mediastreamer2
index e25eb6683a0ae9933b59eb9023424e2333c5d236..902cd8d36daef0913ac235b283668e5b3dbda515 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit e25eb6683a0ae9933b59eb9023424e2333c5d236
+Subproject commit 902cd8d36daef0913ac235b283668e5b3dbda515

diff --git a/oRTP b/oRTP
index d2e91c8d48077fc9ab811e417cb0264d405c982e..d62fa221ed9d373427f1fda9bdbfc301f25a5141 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit d2e91c8d48077fc9ab811e417cb0264d405c982e
+Subproject commit d62fa221ed9d373427f1fda9bdbfc301f25a5141