Link with webkit if enabled

diff --git a/configure.ac b/configure.ac
index b7333bd..8331ce5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -104,13 +104,14 @@ AC_ARG_ENABLE(webkit,
 
 if test "x$with_webkit" == "xyes" ; then
 PKG_CHECK_MODULES(MODEST_WEBKIT,webkit-1.0,have_webkit=true,have_webkit=false)
-MODEST_USE_WEBKIT=1
 AC_SUBST(MODEST_WEBKIT_CFLAGS)
 AC_SUBST(MODEST_WEBKIT_LIBS)
 AC_DEFINE_UNQUOTED(MODEST_USE_WEBKIT, 1, ["Whether modest is being build with webkit support."])
-AC_SUBST(MODEST_USE_WEBKIT)
 fi
 
+AM_CONDITIONAL(MODEST_USE_WEBKIT,test "x$with_webkit" == "xyes")
+
+
 dnl -------
 dnl GtkHTML
 dnl -------

diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am
index 7ae0235..20b4b9a 100644 (file)
--- a/src/widgets/Makefile.am
+++ b/src/widgets/Makefile.am
@@ -164,6 +164,7 @@ libmodest_widgets_la_SOURCES=          \
        modest-zoomable.h              \
        modest-zoomable.c
 
+
 libmodest_widgets_la_includedir = $(includedir)/modest-plugin-1.0/widgets/
 libmodest_widgets_la_include_HEADERS = $(libmodest_widgets_public_headers)
 
@@ -176,6 +177,20 @@ LDADD = \
        $(MODEST_TOOLKIT_LIBS)          \
        $(MODEST_CALENDAR_WIDGETS_LIBS)
 
+if MODEST_USE_WEBKIT
+# libmodest_widgets_la_SOURCES +=          \
+#      modest-webkit-mime-part-view.c   \
+#      modest-webkit-mime-part-view.h   \
+#      modest-webkit-msg-view.c         \
+#      modest-webkit-msg-view.h
+
+LDADD += \
+       $(MODEST_WEBKIT_LIBS)
+
+INCLUDES += \
+       $(MODEST_WEBKIT_CFLAGS)
+endif
+
 UI_FILES=\
        ui/modest-main-window-ui.xml \
        ui/modest-msg-edit-window-ui.xml \