4 files changed, 21 insertions, 23 deletions
diff --git a/backend/epub/Makefile.am b/backend/epub/Makefile.am
index 31dd455e..dc34ad2b 100644
--- a/backend/epub/Makefile.am
+++ b/backend/epub/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 -DATRIL_COMPILATION \
 $(BACKEND_CFLAGS) \
 $(WARN_CXXFLAGS) \
- $(WEBKIT_CFLAGS) \
+ $(EPUB_CFLAGS) \
 $(DISABLE_DEPRECATED)
 
 backend_LTLIBRARIES = libepubdocument.la
@@ -21,7 +21,7 @@ libepubdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libepubdocument_la_LIBADD = \
 $(top_builddir)/libdocument/libatrildocument.la \
 minizip/libminizip.la \
- $(WEBKIT_LIBS) \
+ $(EPUB_LIBS) \
 $(BACKEND_LIBS) 
 
 
diff --git a/configure.ac b/configure.ac
index fc297187..f2f8f749 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,12 +138,16 @@ MATEDESKTOP_REQUIRED=1.9.0
 
 case "$with_gtk" in
 2.0) GTK_API_VERSION=2.0
+ WEBKIT_API_VERSION=1.0
 GAIL_API_VERSION=
 GTK_REQUIRED=2.24.0
+ WEBKIT_REQUIRED=2.4.3
 ;;
 3.0) GTK_API_VERSION=3.0
+ WEBKIT_API_VERSION=3.0
 GAIL_API_VERSION=-3.0
 GTK_REQUIRED=3.0.0
+ WEBKIT_REQUIRED=2.4.3
 ;;
 esac
 
@@ -167,6 +171,14 @@ AC_SEARCH_LIBS([hypot],[m])
 
 PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
 PKG_CHECK_MODULES(LIBVIEW, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gail$GAIL_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
+case "$with_gtk" in
+ 2.0)
+ PKG_CHECK_MODULES(WEBKIT, webkit-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED)
+ ;;
+ 3.0)
+ PKG_CHECK_MODULES(WEBKIT, webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED)
+ ;;
+esac
 PKG_CHECK_MODULES(BACKEND, cairo >= $CAIRO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
 PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
 PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
@@ -698,27 +710,13 @@ AC_ARG_ENABLE(epub,
 [enable_epub=yes])
 
 if test "x$enable_epub" = "xyes"; then
- WEBKIT_REQUIRED=2.4.2
- case "$with_gtk" in
- 2.0)
- PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= $WEBKIT_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED zlib,enable_epub=yes,enable_epub=no)
- ;;
- 3.0)
- PKG_CHECK_MODULES(WEBKIT, webkit2gtk-3.0 >= $WEBKIT_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED zlib,enable_epub=yes,enable_epub=no)
- ;;
- esac
- if test "x$enable_epub" = "xyes"; then
+ PKG_CHECK_MODULES(EPUB, libxml-2.0 >= $LIBXML_REQUIRED zlib,enable_epub=yes,enable_epub=no)
+
+ if test "x$enable_epub" = "xyes"; then
 AC_DEFINE([ENABLE_EPUB], [1], [Enable support for ePub documents.])
 else
 enable_epub="no"
- AC_MSG_WARN(["ePub support is disabled since webkit-1.0( version >= $WEBKIT_REQUIRED ) is needed"])
- case "$with_gtk" in
- 2.0) 
- AC_MSG_WARN(["ePub support is disabled since webkit-1.0( version >= $WEBKIT_REQUIRED ) is needed"])
- ;;
- 3.0)AC_MSG_WARN(["ePub support is disabled since webkit2gtk-3.0( version >= $WEBKIT_REQUIRED ) is needed"])
- ;;
- esac
+ AC_MSG_WARN(["ePub support is disabled."])
 fi
 fi
 
diff --git a/help/reference/libview/Makefile.am b/help/reference/libview/Makefile.am
index edbc870e..dce0dcd1 100644
--- a/help/reference/libview/Makefile.am
+++ b/help/reference/libview/Makefile.am
@@ -110,12 +110,14 @@ GTKDOC_CFLAGS = \
 $(AM_CFLAGS) \
 $(LIBVIEW_CFLAGS) \
 $(WARN_CFLAGS) \
+ $(WEBKIT_CFLAGS) \
 $(DISABLE_DEPRECATED)
 
 GTKDOC_LIBS = \
 $(top_builddir)/libdocument/libatrildocument.la \
 $(top_builddir)/libview/libatrilview.la \
- $(LIBDOCUMENT_LIBS)
+ $(LIBDOCUMENT_LIBS) \
+ $(WEBKIT_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/help/reference/shell/Makefile.am b/help/reference/shell/Makefile.am
index 40ece8fc..a78201d7 100644
--- a/help/reference/shell/Makefile.am
+++ b/help/reference/shell/Makefile.am
@@ -106,7 +106,6 @@ GTKDOC_CFLAGS = \
 -DATRIL_COMPILATION \
 $(SHELL_CFLAGS) \
 $(WARN_CFLAGS) \
- $(WEBKIT_CFLAGS) \
 $(DISABLE_DEPRECATED) \
 $(GTK_PRINT_CFLAGS)
 
@@ -127,7 +126,6 @@ GTKDOC_LIBS = \
 $(top_builddir)/libmisc/libevmisc.la \
 $(SHELL_LIBS) \
 $(GTK_PRINT_LIBS) \
- $(WEBKIT_LIBS) \
 $(filter-out $(FILTER_OUT),$(wildcard $(top_builddir)/shell/*.o))
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.