Merge branch 'master' of git.linphone.org:linphone

diff --git a/configure.ac b/configure.ac
index 22bc2357a83e93078a183bdc84b23d94880a1adf..67060be123d7f151a485312e389abde92cdb9c05 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -330,13 +330,17 @@ fi
 
 AC_WORDS_BIGENDIAN
 
-dnl normaly this should only by done by mediastreamer2/configure.ac
-dnl but to workaround bugs when cross-compiling for arm-linux,
-dnl we need to have SPEEX_LIBS defined
-dnl Furthermore it is good to repeat here all mediastreamer2 toggles
-dnl since top-level configure --help will not print them.
-
-PKG_CHECK_MODULES(SPEEX, speex >= 1.1.6, build_speex=yes)
+AC_ARG_ENABLE([speex],
+             AS_HELP_STRING([--disable-speex], [Disable speex support]),
+             [], [enable_speex=yes])
+if test "x$enable_speex" = "xyes"; then
+       dnl normaly this should only by done by mediastreamer2/configure.ac
+       dnl but to workaround bugs when cross-compiling for arm-linux,
+       dnl we need to have SPEEX_LIBS defined
+       dnl Furthermore it is good to repeat here all mediastreamer2 toggles
+       dnl since top-level configure --help will not print them.
+       PKG_CHECK_MODULES(SPEEX, speex >= 1.1.6, build_speex=yes)
+fi
 
 dnl conditionnal build of video support
 AC_ARG_ENABLE(video,

diff --git a/gtk/main.c b/gtk/main.c
index f7ea40ec1bd89a4c4bbeddc2e2db7bea366af044..0262c5e27adde204ff48650eb9e7c9b10bab95e0 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1699,7 +1699,9 @@ int main(int argc, char *argv[]){
        GdkPixbuf *pbuf;
        const char *app_name="Linphone";
 
+#if !GLIB_CHECK_VERSION(2, 31, 0)
        g_thread_init(NULL);
+#endif
        gdk_threads_init();
        
        progpath = strdup(argv[0]);

diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c
index 1c54fca84e8bc39f756d75d03aacd79a72cc2b2f..ae1bcfa6a0c2bf6a68397b7e381d5049fc97877d 100644 (file)
--- a/gtk/setupwizard.c
+++ b/gtk/setupwizard.c
@@ -270,7 +270,11 @@ static void account_username_changed(GtkEntry *entry, GtkWidget *w) {
        linphone_account_creator_set_username(creator, gtk_entry_get_text(username));
 
        if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) {
+#if !GLIB_CHECK_VERSION(2, 31, 0)
                g_thread_create(check_username_availability, (void*)w, FALSE, NULL);
+#else
+               g_thread_new(NULL, check_username_availability, w);
+#endif
        }
        else {
                if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) {
@@ -534,7 +538,9 @@ GtkWidget * linphone_gtk_create_assistant(void){
        ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png"));
        notok = create_pixbuf(linphone_gtk_get_ui_config("notok","notok.png"));
 
+#if !GLIB_CHECK_VERSION(2, 31, 0)
        g_thread_init (NULL);
+#endif
        gdk_threads_init ();
 
        GtkWidget *p1=create_intro();