Skip to content
Snippets Groups Projects
Commit bc693ff0 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #10463: gnome: added gthread flags, fixes build for gtk2

parent fbe9bbc6
Branches
No related tags found
No related merge requests found
......@@ -35,7 +35,7 @@ fi
# check for gtk+-2.0 and if found, check for webkitgtk-1.0.
PKG_CHECK_MODULES(GTK, gtk+-3.0, [PKG_CHECK_MODULES(WEBKIT, webkitgtk-3.0)],
[PKG_CHECK_MODULES(GTK, gtk+-2.0,
[PKG_CHECK_MODULES(WEBKIT, webkit-1.0)],
[PKG_CHECK_MODULES(WEBKIT, webkit-1.0) && PKG_CHECK_MODULES(GTHREAD, gthread-2.0)],
[AC_MSG_ERROR(gtk-2 not found)])])
PKG_CHECK_MODULES(GCONF, gconf-2.0)
......
......@@ -41,12 +41,13 @@ sflphone_client_gnome_LDADD = $(DBUSGLIB_LIBS) $(LIBNOTIFY_LIBS) \
$(NOTIFY_LIBS) $(SFLPHONEGTK_LIBS) $(X11_LIBS) \
$(GTK_LIBS) $(GLIB_LIBS) $(WEBKIT_LIBS) \
$(LD_LIBS) $(GCONF_LIBS) \
$(JAVASCRIPT_CORE_GTK_LIBS)
$(JAVASCRIPT_CORE_GTK_LIBS) $(GTHREAD_LIBS)
sflphone_client_gnome_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) \
$(NOTIFY_CFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS) \
$(GLIB_CFLAGS) $(WEBKIT_CFLAGS) \
$(GCONF_CFLAGS) $(JAVASCRIPT_CORE_GTK_CFLAGS)
$(GCONF_CFLAGS) $(JAVASCRIPT_CORE_GTK_CFLAGS) \
$(GTHREAD_CFLAGS)
# add symbolic link
install-exec-local:
......
......@@ -29,6 +29,7 @@
#include "imwindow.h"
#include "logger.h"
#include "gtk2_wrappers.h"
#include "imwidget.h"
#include "dbus.h"
#include "unused.h"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment