diff --git a/gnome/Makefile.am b/gnome/Makefile.am index ca8bba4dff38d04e81e9e13af21ba4adb2e09298..cbb5d64c1ffe665302906277712b18b32ddb5deb 100644 --- a/gnome/Makefile.am +++ b/gnome/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src pixmaps webkit tests man po doc +SUBDIRS = src pixmaps tests man po doc CFLAGS=-Wall -Werror -Wextra diff --git a/gnome/configure.ac b/gnome/configure.ac index cf9a8a4ddb9937e3caf34c0b0847eb63bae8edda..35fabd16db628b1ee0acb5340559727adf5306e5 100644 --- a/gnome/configure.ac +++ b/gnome/configure.ac @@ -42,6 +42,13 @@ AS_IF([test "x$enable_video" = "xyes"], [ AM_CONDITIONAL(SFL_VIDEO, test "x$enable_video" = "xyes") +# Check for gtk+-3.0 and if found, check for webkitgtk-3.0, otherwise +# check for gtk+-2.0 and if found, check for webkitgtk-1.0. +PKG_CHECK_MODULES(GTK, gtk+-3.0, + [PKG_CHECK_MODULES(GTK, gtk+-2.0, + [PKG_CHECK_MODULES(GTHREAD, gthread-2.0)], + [AC_MSG_ERROR(gtk-2 not found)])]) + PKG_CHECK_MODULES(GCONF, gconf-2.0) PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.24) PKG_CHECK_MODULES(X11, x11) diff --git a/gnome/src/Makefile.am b/gnome/src/Makefile.am index 97aa6c7639e9254c0c64c87ea69fa4ceb932b69c..4918d519a8aa352b75bf1161d2e398f7bae7b251 100644 --- a/gnome/src/Makefile.am +++ b/gnome/src/Makefile.am @@ -57,19 +57,19 @@ libsflphone_client_la_SOURCES = \ libsflphone_client_la_LIBADD = @CLUTTER_LIBS@ @CLUTTERGTK_LIBS@ $(SFLPHONE_LIBS) libsflphone_client_la_LDFLAGS = @CLUTTER_LDFLAGS@ @DBUSGLIB_LIBS@ @LIBNOTIFY_LIBS@ \ - @X11_LIBS@ @GTK_LIBS@ @GLIB_LIBS@ @WEBKIT_LIBS@ \ + @X11_LIBS@ @GTK_LIBS@ @GLIB_LIBS@ \ $(DL_LIBS) @GCONF_LIBS@ @JAVASCRIPT_CORE_GTK_LIBS@ \ @GTHREAD_LIBS@ @CLUTTERGTK_LDFLAGS@ libsflphone_client_la_CFLAGS = @CLUTTER_CFLAGS@ @DBUSGLIB_CFLAGS@ @LIBNOTIFY_CFLAGS@ \ - @GTK_CFLAGS@ @WEBKIT_CFLAGS@ \ + @GTK_CFLAGS@ \ @GCONF_CFLAGS@ @JAVASCRIPT_CORE_GTK_CFLAGS@ \ @GTHREAD_CFLAGS@ @CLUTTERGTK_CFLAGS@ sflphone_client_gnome_SOURCES = main.c sflphone_client_gnome_CFLAGS = @DBUSGLIB_CFLAGS@ @LIBNOTIFY_CFLAGS@ \ - @GTK_CFLAGS@ @WEBKIT_CFLAGS@ \ + @GTK_CFLAGS@ \ @GCONF_CFLAGS@ @JAVASCRIPT_CORE_GTK_CFLAGS@ \ @GTHREAD_CFLAGS@ sflphone_client_gnome_LDADD = libsflphone_client.la diff --git a/gnome/src/config/Makefile.am b/gnome/src/config/Makefile.am index c512303ea31f51fd96f2b10a620cfd8bac5531a1..7c4ceada74293a1b7539941c2ef76e04356ea461 100644 --- a/gnome/src/config/Makefile.am +++ b/gnome/src/config/Makefile.am @@ -37,7 +37,7 @@ SFL_VIDEO_LDFLAGS=@CLUTTER_LIBS@ @CLUTTERGTK_LIBS@ endif libconfig_la_LDFLAGS = $(DBUSGLIB_LDFLAGS) $(LIBNOTIFY_LDFLAGS) $(GCONF_LDFLAGS) \ - $(GTK_LDFLAGS) $(GLIB_LDFLAGS) $(WEBKIT_LDFLAGS) \ + $(GTK_LDFLAGS) $(GLIB_LDFLAGS) \ $(SFL_VIDEO_LDFLAGS) if SFL_VIDEO @@ -45,12 +45,12 @@ SFL_VIDEO_LIBADD=@CLUTTER_LIBS@ @CLUTTERGTK_LIBS@ endif libconfig_la_LIBADD = $(DBUSGLIB_LIBS) $(LIBNOTIFY_LIBS) $(GCONF_LIBS) \ - $(GTK_LIBS) $(GLIB_LIBS) $(WEBKIT_LIBS) $(SFL_VIDEO_LIBADD) + $(GTK_LIBS) $(GLIB_LIBS) $(SFL_VIDEO_LIBADD) if SFL_VIDEO SFL_VIDEO_CFLAGS=@CLUTTER_CFLAGS@ @CLUTTERGTK_CFLAGS@ endif libconfig_la_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) $(GCONF_CFLAGS) \ - $(GTK_CFLAGS) $(GLIB_CFLAGS) $(WEBKIT_CFLAGS) \ + $(GTK_CFLAGS) $(GLIB_CFLAGS) \ $(SFL_VIDEO_CFLAGS) diff --git a/gnome/src/contacts/Makefile.am b/gnome/src/contacts/Makefile.am index 6154033b906d9217f6a3b75965f8ce34cf4d5c3d..a026b0136dc9c0ab939b728232210473bbb31785 100644 --- a/gnome/src/contacts/Makefile.am +++ b/gnome/src/contacts/Makefile.am @@ -20,9 +20,9 @@ libcontacts_la_SOURCES = \ searchbar.h libcontacts_la_LIBS = $(DBUSGLIB_LIBS) $(LIBNOTIFY_LIBS) \ - $(GTK_LIBS) $(GLIB_LIBS) $(WEBKIT_LIBS) \ + $(GTK_LIBS) $(GLIB_LIBS) \ $(GCONF_LDFLAGS) -ldl libcontacts_la_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) \ - $(GTK_CFLAGS) $(GLIB_CFLAGS) $(WEBKIT_CFLAGS) \ + $(GTK_CFLAGS) $(GLIB_CFLAGS) \ $(GCONF_CFLAGS) diff --git a/gnome/src/dbus/Makefile.am b/gnome/src/dbus/Makefile.am index 354703141106594d5237163c61c3300452cfa4a5..7da5c9afa2537a6b799de63f625d6708b529fadb 100644 --- a/gnome/src/dbus/Makefile.am +++ b/gnome/src/dbus/Makefile.am @@ -32,11 +32,11 @@ libdbus_la_SOURCES= \ $(BUILT_SOURCES) libdbus_la_LDFLAGS= $(DBUSGLIB_LDFLAGS) $(LIBNOTIFY_LDFLAGS) \ - $(GTK_LDFLAGS) $(GLIB_LDFLAGS) $(WEBKIT_LDFLAGS) \ + $(GTK_LDFLAGS) $(GLIB_LDFLAGS) \ $(GCONF_LDFLAGS) libdbus_la_CFLAGS= $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) \ - $(GTK_CFLAGS) $(GLIB_CFLAGS) $(WEBKIT_CFLAGS) \ + $(GTK_CFLAGS) $(GLIB_CFLAGS) \ $(GCONF_CFLAGS) EXTRA_DIST= marshaller.list diff --git a/gnome/src/icons/Makefile.am b/gnome/src/icons/Makefile.am index ecb4274268bf03772f37b30e7f99547d4a3b7dbf..37efcb6036aa96892ee1c648df08da40b129b45f 100644 --- a/gnome/src/icons/Makefile.am +++ b/gnome/src/icons/Makefile.am @@ -7,7 +7,7 @@ libicons_la_SOURCES = icon_factory.c \ pixmap_data.h libicons_la_LDFLAGS = $(DBUSGLIB_LDFLAGS) $(LIBNOTIFY_LDFLAGS) \ - $(GTK_LDFLAGS) $(GLIB_LDFLAGS) $(WEBKIT_LDFLAGS) + $(GTK_LDFLAGS) $(GLIB_LDFLAGS) libicons_la_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) \ - $(GTK_CFLAGS) $(GLIB_CFLAGS) $(WEBKIT_CFLAGS) + $(GTK_CFLAGS) $(GLIB_CFLAGS) diff --git a/gnome/tests/Makefile.am b/gnome/tests/Makefile.am index 716178003120d7b6edc1528c63e30ffb7dd8b4e0..93384b261576d2ee7609d9acb5bcdaa872be10dd 100644 --- a/gnome/tests/Makefile.am +++ b/gnome/tests/Makefile.am @@ -12,8 +12,8 @@ SFLPHONE_LIBS= $(top_builddir)/src/libsflphone_client.la \ check_global_SOURCES = check_global.c -check_global_CFLAGS = @CHECK_CFLAGS@ @GTK_CFLAGS@ @GLIB_CFLAGS@ @DBUSGLIB_CFLAGS@ @GCONF_CFLAGS@ @WEBKIT_CFLAGS@ -check_global_LDADD = $(SFLPHONE_LIBS) @CHECK_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @DBUSGLIB_LIBS@ @GCONF_LIBS@ @WEBKIT_LIBS@ -ldl @X11_LIBS@ +check_global_CFLAGS = @CHECK_CFLAGS@ @GTK_CFLAGS@ @GLIB_CFLAGS@ @DBUSGLIB_CFLAGS@ @GCONF_CFLAGS@ +check_global_LDADD = $(SFLPHONE_LIBS) @CHECK_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @DBUSGLIB_LIBS@ @GCONF_LIBS@ -ldl @X11_LIBS@ check_contacts_SOURCES = check_contacts.c check_contacts_CFLAGS = @CHECK_CFLAGS@ @GTK_CFLAGS@ @@ -25,7 +25,7 @@ check_config_LDADD = $(SFLPHONE_LIBS) @CHECK_LIBS@ check_dbus_SOURCES = check_dbus.c -check_dbus_CFLAGS = @CHECK_CFLAGS@ @GTK_CFLAGS@ @DBUSGLIB_CFLAGS@ @GCONF_CFLAGS@ @WEBKIT_CFLAGS@ +check_dbus_CFLAGS = @CHECK_CFLAGS@ @GTK_CFLAGS@ @DBUSGLIB_CFLAGS@ @GCONF_CFLAGS@ if SFL_VIDEO check_dbus_CFLAGS+=@CLUTTER_CFLAGS@ @CLUTTERGTK_CFLAGS@ endif