[evolution/webkit: 39/146] Misc fixes for rebase of webkit port to evolution/evolution-data-server 3.4 branches.

[Dan VrÃtil <dvratil src gnome org>]

commit 5d372c3a3c7fd766879d05616e07bf312383cc54
Author: Jose Dapena Paz <jdapena igalia com>
Date:   Fri Oct 7 13:05:41 2011 +0200

    Misc fixes for rebase of webkit port to evolution/evolution-data-server 3.4 branches.

 addressbook/importers/Makefile.am               |    2 +-
 configure.ac                                    |    6 ++++--
 mail/Makefile.am                                |    1 +
 modules/web-inspector/Makefile.am               |    2 ++
 modules/web-inspector/evolution-web-inspector.c |    2 +-
 plugins/audio-inline/Makefile.am                |    1 +
 plugins/vcard-inline/Makefile.am                |    1 +
 widgets/misc/Makefile.am                        |    3 +--
 8 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am
index 19f6892..5feb1e6 100644
--- a/addressbook/importers/Makefile.am
+++ b/addressbook/importers/Makefile.am
@@ -10,7 +10,7 @@ libevolution_addressbook_importers_la_CPPFLAGS =	\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)/addressbook			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
-	$(WEBKITGTK_CFLAGS)
+	$(GNOME_PLATFORM_CFLAGS)
 
 libevolution_addressbook_importers_la_SOURCES = \
 	evolution-ldif-importer.c		\
diff --git a/configure.ac b/configure.ac
index 14bbbbf..eb8cd98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,8 @@ m4_define([gnome_desktop_minimum_version], [2.91.3])
 m4_define([gnome_icon_theme_minimum_version], [2.30.2.1])
 m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92])
 m4_define([pangoft2_minimum_version], [1.0.1])		dnl For libgnomecanvas
-m4_define([webkitgtk_minimum_version], [1.5.2])		dnl XXX Just a Guess
+m4_define([webkitgtk_minimum_version], [1.6.1])		dnl XXX Just a Guess
+m4_define([javascriptcoregtk_minimum_version], [1.6.1])		dnl XXX Just a Guess
 m4_define([gconf_minimum_version], [2.0.0])		dnl XXX Just a Guess
 m4_define([libsoup_minimum_version], [2.4.0])		dnl XXX Just a Guess
 m4_define([libxml_minimum_version], [2.7.3])
@@ -252,7 +253,8 @@ PKG_CHECK_MODULES([GNOME_PLATFORM],
 	 shared-mime-info >= shared_mime_info_minimum_version
 	 gnome-desktop-3.0 >= gnome_desktop_minimum_version
 	 gsettings-desktop-schemas >= gsettings_desktop_schemas_minimum_version
-	 webkitgtk-3.0 >= webkitgtk_minimum_version])
+	 webkitgtk-3.0 >= webkitgtk_minimum_version
+	 javascriptcoregtk-3.0 >= javascriptcoregtk_minimum_version])
 AC_SUBST(GNOME_PLATFORM_CFLAGS)
 AC_SUBST(GNOME_PLATFORM_LIBS)
 
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 5a7cae8..3fc0325 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -22,6 +22,7 @@ libevolution_mail_la_CPPFLAGS =				\
 	$(CERT_UI_CFLAGS)				\
 	$(CANBERRA_CFLAGS)				\
 	$(CLUTTER_CFLAGS)				\
+	$(GTKHTML_CFLAGS)                               \
 	$(LIBSOUP_CFLAGS)				\
 	$(GTKHTML_CFLAGS)				\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
diff --git a/modules/web-inspector/Makefile.am b/modules/web-inspector/Makefile.am
index 208011c..f8a1fc9 100644
--- a/modules/web-inspector/Makefile.am
+++ b/modules/web-inspector/Makefile.am
@@ -5,6 +5,7 @@ libevolution_module_web_inspector_la_CPPFLAGS =			\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
 	-DG_LOG_DOMAIN=\"evolution-web-inspector\"		\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)
 
 libevolution_module_web_inspector_la_SOURCES =			\
@@ -13,6 +14,7 @@ libevolution_module_web_inspector_la_SOURCES =			\
 libevolution_module_web_inspector_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
 libevolution_module_web_inspector_la_LDFLAGS =			\
diff --git a/modules/web-inspector/evolution-web-inspector.c b/modules/web-inspector/evolution-web-inspector.c
index 8682f75..01fd6aa 100644
--- a/modules/web-inspector/evolution-web-inspector.c
+++ b/modules/web-inspector/evolution-web-inspector.c
@@ -20,7 +20,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <misc/e-web-view.h>
-#include <e-util/e-extension.h>
+#include <libebackend/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_WEB_INSPECTOR \
diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am
index d5dc1a5..fc204f9 100644
--- a/plugins/audio-inline/Makefile.am
+++ b/plugins/audio-inline/Makefile.am
@@ -27,6 +27,7 @@ liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_audio_inline_la_LIBADD =			\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/e-util/libeutil.la		\
+	$(top_builddir)/em-format/libemformat.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(GSTREAMER_LIBS)				\
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
index 07b747a..edc612e 100644
--- a/plugins/vcard-inline/Makefile.am
+++ b/plugins/vcard-inline/Makefile.am
@@ -29,6 +29,7 @@ liborg_gnome_vcard_inline_la_LIBADD =					\
 	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
 	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la	\
 	$(top_builddir)/addressbook/printing/libecontactprint.la	\
+	$(top_builddir)/em-format/libemformat.la			\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)						\
 	$(GTKHTML_LIBS)
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 07545d1..0560c1c 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -82,8 +82,7 @@ libemiscwidgets_la_CPPFLAGS =						\
 	$(GNOME_PLATFORM_CFLAGS)					\
 	$(CHAMPLAIN_CFLAGS)						\
 	$(GEOCLUE_CFLAGS)						\
-	$(CLUTTER_CFLAGS)						\
-	$(GTKHTML_CFLAGS)
+	$(CLUTTER_CFLAGS)
 
 libemiscwidgets_la_SOURCES =			\
 	$(widgetsinclude_HEADERS)		\