diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index d8815a09..b9137d84 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_define([ev_major_version], [1]) m4_define([ev_minor_version], [26]) -m4_define([ev_micro_version], [0]) +m4_define([ev_micro_version], [2]) m4_define([ev_extra_version], []) m4_define([ev_version], [ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version]) @@ -580,8 +580,11 @@ AC_ARG_ENABLE(comics, [enable_comics=$enableval], [enable_comics=yes]) +COMICS_DEPS="libarchive" if test "x$enable_comics" = "xyes"; then AC_DEFINE([ENABLE_COMICS], [1], [Enable support for comics.]) + PKG_CHECK_MODULES([COMICS], [$COMICS_DEPS]) + AC_SUBST(COMICS_LIBS) fi AM_CONDITIONAL(ENABLE_COMICS, test x$enable_comics = xyes) @@ -622,7 +625,13 @@ AC_ARG_ENABLE(epub, have_webkit="no" if test "x$enable_epub" = "xyes"; then - PKG_CHECK_MODULES(EPUB, webkit2gtk-4.0 >= $WEBKIT_REQUIRED \ + dnl select the available WebKit2Gtk4 version, with a preference towards 4.1 + webkit_pkg=webkit2gtk-4.1 + PKG_CHECK_EXISTS([$webkit_pkg >= $WEBKIT_REQUIRED], [], + [PKG_CHECK_EXISTS([webkit2gtk-4.0 >= $WEBKIT_REQUIRED], + [webkit_pkg=webkit2gtk-4.0])]) + + PKG_CHECK_MODULES(EPUB, $webkit_pkg >= $WEBKIT_REQUIRED \ libxml-2.0 >= $LIBXML_REQUIRED zlib,have_webkit=yes,have_webkit=no) if test "x$have_webkit" = "xyes"; then |